view tests/test-diff-color.out @ 11306:deaeb2d84d8a stable

fix encoding bug in 05ac42e56452
author Sune Foldager <cryo@cyanite.org>
date Tue, 08 Jun 2010 13:19:22 +0200
parents d29bd00bbc50
children d7732d2df54a
line wrap: on
line source

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?]