tests/test-diff-reverse.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 05 Apr 2010 18:13:20 +0200
branchstable
changeset 10836 e5aaa4543289
parent 9857 24bc6e414610
permissions -rw-r--r--
dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.

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