tests/test-diff-reverse.out
author Martin Geisler <mg@aragost.com>
Fri, 13 Aug 2010 15:17:55 +0200
branchstable
changeset 11840 3f838abf2b96
parent 9857 24bc6e414610
permissions -rw-r--r--
tests: update to match "hg help resolve" output from 53fdc0989047

adding a
diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a
--- a/a	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,3 @@
-d
-e
-f
+a
+b
+c
diff -r 2855cdcfcbb7 a
--- a/a
+++ b/a
@@ -1,5 +1,3 @@
 d
 e
 f
-g
-h