##// END OF EJS Templates
Merge with redone c655432c2c24 (issue1860)
Merge with redone c655432c2c24 (issue1860)

File last commit:

r9602:fc493cb9 merge default
r9602:fc493cb9 merge default
Show More
test-diff-color.out
40 lines | 602 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
% 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?]