##// 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
/ tests / test-diff-color.out
Augie Fackler
color: Add tests for colorized diff and status output.
r7458 adding a
% default context
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
Augie Fackler
color: Add tests for colorized diff and status output.
r7458 c
a
a
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 -b
+dd
Augie Fackler
color: Add tests for colorized diff and status output.
r7458 a
a
c
% --unified=2
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
Augie Fackler
color: Add tests for colorized diff and status output.
r7458 a
a
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 -b
+dd
Augie Fackler
color: Add tests for colorized diff and status output.
r7458 a
a
Brodie Rao
color: colorize diff --stat
r9641 % diffstat
a | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Brodie Rao
color: add test for record support
r9579 % record
diff --git a/a b/a
old mode 100644
new mode 100755
Matt Mackall
color: fix test-diff-color breakage
r11751 1 hunks, 1 lines changed
Martin Geisler
record: separate each hunk with a blank line...
r10694 examine changes to 'a'? [Ynsfdaq?]
@@ -2,7 +2,7 @@
Brodie Rao
color: add test for record support
r9579 c
a
a
-b
+dd
a
a
c
Mads Kiilerich
Merge with redone c655432c2c24 (issue1860)
r9602 record this change to 'a'? [Ynsfdaq?]
Martin Geisler
record: separate each hunk with a blank line...
r10694
Matt Mackall
rollback: fix up tests
r11175 rolling back to revision 0 (undo commit)
Martin Geisler
color: wrap qrecord...
r9711 % qrecord
diff --git a/a b/a
old mode 100644
new mode 100755
Matt Mackall
color: fix test-diff-color breakage
r11751 1 hunks, 1 lines changed
Martin Geisler
record: separate each hunk with a blank line...
r10694 examine changes to 'a'? [Ynsfdaq?]
@@ -2,7 +2,7 @@
Martin Geisler
color: wrap qrecord...
r9711 c
a
a
-b
+dd
a
a
c
record this change to 'a'? [Ynsfdaq?]
Martin Geisler
record: separate each hunk with a blank line...
r10694