view tests/test-diff-reverse.out @ 11733:b43cfaf571d6

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Aug 2010 10:55:51 -0500
parents 24bc6e414610
children
line wrap: on
line source

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