user-manual: describe how higher stages are set during a merge

[git/git-svn.git] / t / t4101 / diff.1-2

--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
 a
-b
-c
+b
\ No newline at end of file