Search found 9 matches

by dchirgwin
Wed Jun 15, 2022 10:59 am
Forum: ExamDiff Pro
Topic: Directory comparison - ignore line break style
Replies: 2
Views: 2836

Re: Directory comparison - ignore line break style

Thanks for your prompt response. This appears to be a problem with WSL2. My files with LF are on a WSL2 drive which is mounted on Windows but they don't work properly during Directory Compare. If I move them back onto the Windows FS (but leave the line endings as they were) it all works as expected....
by dchirgwin
Wed Jun 15, 2022 6:19 am
Forum: ExamDiff Pro
Topic: Directory comparison - ignore line break style
Replies: 2
Views: 2836

Directory comparison - ignore line break style

Can anyone tell me how to ignore line break style when doing a directory comparison (using full file comparison)? I sort of presumed a full file comparison would use the "ignores" that were specified for simple Text Comparison, but it doesn't seem to work like that. My situation is that I ...
by dchirgwin
Thu Jan 20, 2022 11:30 pm
Forum: ExamDiff Pro
Topic: How to use ExamDiff Pro with git and WSL2
Replies: 4
Views: 4488

Re: How to use ExamDiff Pro with git and WSL2

Thanks for posting this. Before we update https://www.prestosoft.com/edp_versioncontrol.asp, let me ask you: do you have the details of setting up EDP as a merge tool as well? No, I haven't tried that yet. I expect the configuration will be similar - I'll post something soon when I've had a chance ...
by dchirgwin
Thu Jan 20, 2022 11:27 pm
Forum: ExamDiff Pro
Topic: How to use ExamDiff Pro with git and WSL2
Replies: 4
Views: 4488

Re: How to use ExamDiff Pro with git and WSL2

Hi @Mudguard, I suspect we are doing slightly different things here. I am invoking ExamDiff Pro from the WSL2 Linux command line, and there is no such path "/C/Program Files/..." at that point. However, if I open a Cygwin command line in Windows (e.g. by spawning a terminal from SourceTree...
by dchirgwin
Thu Jan 20, 2022 4:18 am
Forum: ExamDiff Pro
Topic: How to use ExamDiff Pro with git and WSL2
Replies: 4
Views: 4488

How to use ExamDiff Pro with git and WSL2

I'm doing Linux development using WSL2, but I still want to use ExamDiff Pro as my git difftool. Turns out there is an easy way to do this, so I'm sharing it here for others to use (maybe it could be added to the https://www.prestosoft.com/edp_versioncontrol.asp page?) All you need to do is edit you...
by dchirgwin
Sat Nov 27, 2021 4:01 am
Forum: ExamDiff Pro
Topic: Directory Comparison and "Ignore lines"
Replies: 7
Views: 4613

Re: Directory Comparison and "Ignore lines"

More information: This is nothing to do with linebreak styles. If I try to compare two directories which are both on the remote Linux drive, and both contain files with Linux linebreaks, it correctly detects Added / Deleted files but shows status of "Error!" for files that exist in both di...
by dchirgwin
Sat Nov 27, 2021 2:02 am
Forum: ExamDiff Pro
Topic: Directory Comparison and "Ignore lines"
Replies: 7
Views: 4613

Re: Directory Comparison and "Ignore lines"

I have looked again and I think I was getting confused by the color-coding. It appears that the older of the two files shows in red/green and the newer shows in purple/blue. That's fine - I just misunderstood. However, the underlying problem remains, that identical files with different linebreak sty...
by dchirgwin
Fri Nov 26, 2021 5:17 am
Forum: ExamDiff Pro
Topic: Directory Comparison and "Ignore lines"
Replies: 7
Views: 4613

Re: Directory Comparison and "Ignore lines"

I'm trying to do this using ExamDiff Pro Master 12.0.1.10 (64-bit) and it doesn't appear to be working. My directories are based on the same files, but one with Windows linebreaks and one with Linux linebreaks. The directory comparison shows all files are different, but when I click on a file to see...
by dchirgwin
Thu Apr 13, 2017 12:42 am
Forum: ExamDiff Pro
Topic: Merge feedback - upgrade to 9.0
Replies: 1
Views: 4752

Merge feedback - upgrade to 9.0

Hi there, I've just upgraded to 9.0 from 8.x so I am seeing the new look/feel for the first time. Generally it is fine, but I have one small complaint - in 3-way merge, the icon telling you which side has been chosen has changed. It used to show a blue diamond to indicate the chosen block, or a gree...