Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Different Diff program #128

Open
GoogleCodeExporter opened this issue Sep 19, 2015 · 3 comments
Open

Different Diff program #128

GoogleCodeExporter opened this issue Sep 19, 2015 · 3 comments

Comments

@GoogleCodeExporter
Copy link

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
Copy link
Author

Issue 133 has been merged into this issue.

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

@GoogleCodeExporter
Copy link
Author

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

  • Added labels: Type-Enhancement
  • Removed labels: Type-Defect

@GoogleCodeExporter
Copy link
Author

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

  • Changed state: Started

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant