Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "ListOfDiffApplications" page has been changed by BenReser: https://wiki.apache.org/subversion/ListOfDiffApplications?action=diff&rev1=7&rev2=8 Comment: move the explanation of how to use vimdiff under the vimdiff section not p4merge, and make it clear that vimdiff isn't special to the Mac or MacVim but is just a normal part of vim. =========================================================================================== - MacVim (Mac) + vim (almost any OS you want) commandline helper for Vim style editors - http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/vimdiff.1.html#//apple_ref/doc/man/1/vimdiff + http://vimdoc.sourceforge.net/htmldoc/diff.html vimdiff [options] file1 file2 [file3 [file4]] - (Note, this diff works 4 files?) + The vim diff mode can work with up to 4 files. + + Notes: + http://stackoverflow.com/questions/569270/change-default-svn-diffing-tool + #!/bin/sh + # Configure your favorite diff program here. + DIFF="/usr/bin/vimdiff" + # Subversion provides the paths we need as the sixth and seventh + # parameters. + LEFT="$6" + RIGHT="$7" + # Call the diff command (change the following line to make sense for + # your merge program). + "$DIFF" "$LEFT" "$RIGHT" + + # Return an errorcode of 0 if no differences were detected, 1 if some were. + # Any other errorcode will be treated as fatal. + + Then change your $HOME/.subversion/config file to point at that script: + + [helpers] + diff-cmd = /home/matt/bin/diffwrap.sh =========================================================================================== @@ -506, +527 @@ (see manual page above for details on switches) - Notes: - - http://stackoverflow.com/questions/569270/change-default-svn-diffing-tool - #!/bin/sh - # Configure your favorite diff program here. - DIFF="/usr/bin/vimdiff" - # Subversion provides the paths we need as the sixth and seventh - # parameters. - LEFT="$6" - RIGHT="$7" - # Call the diff command (change the following line to make sense for - # your merge program). - "$DIFF" "$LEFT" "$RIGHT" - - # Return an errorcode of 0 if no differences were detected, 1 if some were. - # Any other errorcode will be treated as fatal. - - Then change your $HOME/.subversion/config file to point at that script: - - [helpers] - diff-cmd = /home/matt/bin/diffwrap.sh - =========================================================================================== Meld (Linux, Os X, Windows)
