tests/test-diff-color.out
author Matt Mackall <mpm@selenic.com>
Wed, 28 Apr 2010 13:45:21 -0500
branchstable
changeset 11031 409c0e4d79e9
parent 9711 d29bd00bbc50
child 10694 d7732d2df54a
permissions -rw-r--r--
Merge with i18n

adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
 a
 a
-b
+dd
 a
 a
% diffstat
 a |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
% record
diff --git a/a b/a
old mode 100644
new mode 100755
1 hunks, 2 lines changed
examine changes to 'a'? [Ynsfdaq?] @@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
record this change to 'a'? [Ynsfdaq?] 
rolling back last transaction
% qrecord
diff --git a/a b/a
old mode 100644
new mode 100755
1 hunks, 2 lines changed
examine changes to 'a'? [Ynsfdaq?] @@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
record this change to 'a'? [Ynsfdaq?]