Mercurial > hg
comparison tests/test-diff-color.out @ 10694:d7732d2df54a
record: separate each hunk with a blank line
This makes it easier for the eye to find the beginning of a hunk when
scrolling up in the terminal.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 14 Mar 2010 23:10:52 +0100 |
parents | d29bd00bbc50 |
children | f0bfe42c7b1f |
comparison
equal
deleted
inserted
replaced
10693:2c2b2d384a47 | 10694:d7732d2df54a |
---|---|
29 % record | 29 % record |
30 [0;1mdiff --git a/a b/a[0m | 30 [0;1mdiff --git a/a b/a[0m |
31 [0;36;1mold mode 100644[0m | 31 [0;36;1mold mode 100644[0m |
32 [0;36;1mnew mode 100755[0m | 32 [0;36;1mnew mode 100755[0m |
33 1 hunks, 2 lines changed | 33 1 hunks, 2 lines changed |
34 examine changes to 'a'? [Ynsfdaq?] [0;35m@@ -2,7 +2,7 @@[0m | 34 examine changes to 'a'? [Ynsfdaq?] |
35 [0;35m@@ -2,7 +2,7 @@[0m | |
35 c | 36 c |
36 a | 37 a |
37 a | 38 a |
38 [0;31m-b[0m | 39 [0;31m-b[0m |
39 [0;32m+dd[0m | 40 [0;32m+dd[0m |
40 a | 41 a |
41 a | 42 a |
42 c | 43 c |
43 record this change to 'a'? [Ynsfdaq?] | 44 record this change to 'a'? [Ynsfdaq?] |
45 | |
44 rolling back last transaction | 46 rolling back last transaction |
45 % qrecord | 47 % qrecord |
46 [0;1mdiff --git a/a b/a[0m | 48 [0;1mdiff --git a/a b/a[0m |
47 [0;36;1mold mode 100644[0m | 49 [0;36;1mold mode 100644[0m |
48 [0;36;1mnew mode 100755[0m | 50 [0;36;1mnew mode 100755[0m |
49 1 hunks, 2 lines changed | 51 1 hunks, 2 lines changed |
50 examine changes to 'a'? [Ynsfdaq?] [0;35m@@ -2,7 +2,7 @@[0m | 52 examine changes to 'a'? [Ynsfdaq?] |
53 [0;35m@@ -2,7 +2,7 @@[0m | |
51 c | 54 c |
52 a | 55 a |
53 a | 56 a |
54 [0;31m-b[0m | 57 [0;31m-b[0m |
55 [0;32m+dd[0m | 58 [0;32m+dd[0m |
56 a | 59 a |
57 a | 60 a |
58 c | 61 c |
59 record this change to 'a'? [Ynsfdaq?] | 62 record this change to 'a'? [Ynsfdaq?] |
63 |