##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r11751:b8b4a241 default
r12315:ca58f647 merge default
Show More
test-diff-color.out
63 lines | 1011 B | text/plain | TextLexer
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?]