search

christian0101 / svnx

Automatically exported from code.google.com/p/svnx
0 stars 0 forks source link

Different Diff program #128

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
It would be great if we can configure svnX to use any kind of diff program by 
allowing a configurable command line to be used.

Original issue reported on code.google.com by marco.nova@gmail.com on 19 Jan 2011 at 5:15

GoogleCodeExporter commented 9 years ago 
Issue 133 has been merged into this issue.

Original comment by chris...@gmail.com on 14 Apr 2011 at 12:45

GoogleCodeExporter commented 9 years ago

Original comment by chris...@gmail.com on 14 Apr 2011 at 12:46

GoogleCodeExporter commented 9 years ago 
It’s now possible in svnX 2.0b1 to add a custom diff app.

In svnX.app/Contents/Resources/DiffApps.plist add a new dict to `list` with a 
`value` of, say, 99.
Update `paths` with the tool’s directory.
To the top level dict add `diff` = `<my-diff-tool> <my-options> "$file1" 
"$file2"` to be evaled in svndiff.sh
and optionally `merge` = `<my-merge-tool> <my-options> "$file1" "$file2" 
"$base" "$targ"` to be evaled in svnresolve.sh.

Simplez :-).

Original comment by chris...@gmail.com on 24 Aug 2015 at 7:47