Mercurial > hg
annotate tests/test-diff-color.out @ 9761:647f8c857810
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Tue, 20 Oct 2009 15:26:22 -0200 |
parents | fc493cb90bb1 |
children | 9b99f158348a |
rev | line source |
---|---|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 adding a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 % default context |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
3 [0;1mdiff -r cf9f4ba66af2 a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
4 [0;31;1m--- a/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
5 [0;32;1m+++ b/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
6 [0;35m@@ -2,7 +2,7 @@[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
7 c |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
9 a |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
10 [0;31m-b[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
11 [0;32m+dd[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
12 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
13 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
14 c |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 % --unified=2 |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
16 [0;1mdiff -r cf9f4ba66af2 a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
17 [0;31;1m--- a/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
18 [0;32;1m+++ b/a[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
19 [0;35m@@ -3,5 +3,5 @@[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
20 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
21 a |
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
22 [0;31m-b[0m |
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
23 [0;32m+dd[0m |
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
24 a |
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 a |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
26 % record |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
27 [0;1mdiff --git a/a b/a[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
28 [0;36;1mold mode 100644[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
29 [0;36;1mnew mode 100755[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
30 1 hunks, 2 lines changed |
9602
fc493cb90bb1
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com>
parents:
9579
diff
changeset
|
31 examine changes to 'a'? [Ynsfdaq?] [0;35m@@ -2,7 +2,7 @@[0m |
9579
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
32 c |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
33 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
34 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
35 [0;31m-b[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
36 [0;32m+dd[0m |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
37 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
38 a |
c06e7581bbaa
color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents:
7459
diff
changeset
|
39 c |
9602
fc493cb90bb1
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com>
parents:
9579
diff
changeset
|
40 record this change to 'a'? [Ynsfdaq?] |