tests/test-diff-color.out
author Martin Geisler <mg@lazybytes.net>
Sun, 29 Aug 2010 23:56:19 +0200
changeset 12077 ff6f5310ad92
parent 11751 b8b4a2417fbd
permissions -rw-r--r--
util: add optional path auditor argument to canonpath The canonpath function will default to creating its own path auditor, but in some cases it will be useful to use a specialized auditor, e.g., one that wont abort if a path lies within a subrepository.

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, 1 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 to revision 0 (undo commit)
% qrecord
diff --git a/a b/a
old mode 100644
new mode 100755
1 hunks, 1 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?]