Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
noresm:svntutorial [2013-12-12 14:01:48] alfg [PART 8: Merge back to trunk] |
noresm:svntutorial [2014-04-14 08:38:00] alfg [PART 7: Verify that you are happy with merge] |
||
---|---|---|---|
Line 180: | Line 180: | ||
==> emacs or vi should be invoked in "merge mode" | ==> emacs or vi should be invoked in "merge mode" | ||
- | The vi script shows (your, ancestor, mine) on top and output below | + | //The vi script// shows (your, ancestor, mine) on top and output below. Move around in the different windows with " |
- | the emacs script shows (yours, mine) on top and merged version (including common ancestor) below | + | |
+ | //the emacs script// shows (yours, mine) on top and merged version (including common ancestor) below | ||
All editing should happen in the lowest part of the editor window | All editing should happen in the lowest part of the editor window | ||
Line 198: | Line 199: | ||
Note how it is difficult to understand the diff ==> we need to configure a diff tool! | Note how it is difficult to understand the diff ==> we need to configure a diff tool! | ||
- | To configure a nice diff-viewer, | + | To configure a nice diff-viewer, |
- | TWO LINES long!! (Make sure it is executable with "chmod +x scriptname" | + | |
< | < | ||
diff-cmd = / | diff-cmd = / | ||
</ | </ | ||
+ | |||
+ | The script " | ||
The content of this script (only two lines) for emacs users can be: | The content of this script (only two lines) for emacs users can be: | ||
Line 212: | Line 214: | ||
</ | </ | ||
- | (Use | (pipeline) key in the " | + | (In emacs, use | (pipeline) key in the " |
The content of this script for vi users can be | The content of this script for vi users can be |