Mercurial > hg

annotate tests/test-diff-color.out @ 9583:0491be4448bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: limit considered set to descendants of first good rev
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Oct 2009 14:59:28 -0500
parents c06e7581bbaa
children fc493cb90bb1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 diff -r cf9f4ba66af2 a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
4 --- a/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
5 +++ b/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
6 @@ -2,7 +2,7 @@
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 -b
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
11 +dd
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 diff -r cf9f4ba66af2 a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
17 --- a/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
18 +++ b/a
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
19 @@ -3,5 +3,5 @@
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 -b
3fb5c142a9f0 color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents: 7458
diff changeset
23 +dd
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 diff --git a/a b/a
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
28 old mode 100644
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
29 new mode 100755
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
30 1 hunks, 2 lines changed
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
31 examine changes to 'a'? [Ynsfdaq?] @@ -2,7 +2,7 @@
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 -b
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
36 +dd
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
c06e7581bbaa color: add test for record support
Brodie Rao <me+hg@dackz.net>
parents: 7459
diff changeset
40 record this change to 'a'? [Ynsfdaq?]