-
Notifications
You must be signed in to change notification settings - Fork 347
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
Add options which allows us to use difft as Apache Subversion's external diff tool #562
base: master
Are you sure you want to change the base?
Conversation
Neat, it'd be nice to have svn support. I'm OK with adding label options, but I don't like having multiple ways of setting the display mode. Could we support this syntax similar to git support? If it's always the same arguments in the same order, we could allow those arguments without allowing |
Thank you for being interested in this PR.
How about hiding |
838734c
to
e4b52d5
Compare
I'd be interested! |
@futatuki can you rebase your diff, please? |
Yes, I'm willing to do later, with pleasure. |
Thanks! I am using your patch, it is really helpful. I hope @Wilfred sees this in time and can maybe integrate it :) |
With this, we can use difft as a external diff for Apache Subversion, in the form: svn diff --diff-cmd=difft -x '<at least one difft option>'
If "svn diff --diff-cmd" is called without -x option, svn executes external diff command with -u option. So this allows to use difft as external diff for Apache Subversion, without extra options.
e4b52d5
to
ff7cbca
Compare
Rebase done. |
svn, Apache Subversion's command line client also has option to use external diff tool for
svn diff
subcommand. However it assumes that diff tool has diff compatible -L (label) and -u option.This implements -L and -u options.