Differences

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

--- noresm:svntutorial [2014-04-14 08:37:48]
alfg [PART 7: Verify that you are happy with merge]
+++ noresm:svntutorial [2022-05-31 09:29:32] (current)
@@ Line 214: / Line 214: @@
 </file>
-(In emcas, 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