Show More
@@ -51,6 +51,27 b' default context' | |||||
51 | a |
|
51 | a | |
52 | c |
|
52 | c | |
53 |
|
53 | |||
|
54 | trailing whitespace | |||
|
55 | ||||
|
56 | $ cp a a.orig | |||
|
57 | $ sed 's/^dd$/dd \r/' a >a.new | |||
|
58 | $ mv a.new a | |||
|
59 | $ hg diff --nodates | |||
|
60 | \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc) | |||
|
61 | \x1b[0;31;1m--- a/a\x1b[0m (esc) | |||
|
62 | \x1b[0;32;1m+++ b/a\x1b[0m (esc) | |||
|
63 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | |||
|
64 | c | |||
|
65 | a | |||
|
66 | a | |||
|
67 | \x1b[0;31m-b\x1b[0m (esc) | |||
|
68 | \x1b[0;32m+dd\x1b[0m\x1b[0;1;41m \x1b[0m\r (esc) | |||
|
69 | a | |||
|
70 | a | |||
|
71 | c | |||
|
72 | ||||
|
73 | $ mv a.orig a | |||
|
74 | ||||
54 | (check that 'ui.color=yes' match '--color=auto') |
|
75 | (check that 'ui.color=yes' match '--color=auto') | |
55 |
|
76 | |||
56 | $ hg diff --nodates --config ui.formatted=no |
|
77 | $ hg diff --nodates --config ui.formatted=no |
General Comments 0
You need to be logged in to leave comments.
Login now