Differences

This shows you the differences between two versions of the page.

--- noresm:svntutorial [2013-12-13 07:27:35]
alfg [PART 6: Go back to merge operation and use merge tool]
+++ noresm:svntutorial [2022-05-31 09:29:32] (current)
@@ Line 199: / Line 199: @@
 Note how it is difficult to understand the diff ==> we need to configure a diff tool!
-To configure a nice diff-viewer, you need to replace a line in your $HOME/.subversion/config. (use a file somewhere on your PC). The script is only
+To configure a nice diff-viewer, you need to replace a line in your $HOME/.subversion/config file like this:
-TWO LINES long!! (Make sure it is executable with "chmod +x scriptname")
 <file>
 diff-cmd = /home/alfg/bin/diffwrap.sh
 </file>
+The script "diffwrap.sh" has be created somewhere on your PC. The script is only TWO LINES long!! (Make sure it is executable with "chmod +x scriptname")
 The content of this script (only two lines) for emacs users can be:
@@ Line 213: / Line 214: @@
 </file>
-(Use | (pipeline) key in the "ediff" dialog to toggle between vertical/horizontal diff view)
+(In emacs, use | (pipeline) key in the "ediff" dialog to toggle between vertical/horizontal diff view)
 The content of this script for vi users can be