Mercurial > hg

annotate tests/test-merge-revert.out @ 1698:ad4a2eefe4d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update copyright notice
author Matt Mackall <mpm@selenic.com>
date Sun, 05 Feb 2006 22:21:02 -0600
parents 5a034646e472
children 7544700fd931
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
1 1:3aa14bbc23d9
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
2 0:8633637036c1
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4 8633637036c1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 8633637036c1+
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 8633637036c1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 merging file1
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
9 3aa14bbc23d9 tip
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 896
diff changeset
10 3aa14bbc23d9 tip
792
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
11 3aa14bbc23d9 tip
49ec802b4a16 Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
12 3aa14bbc23d9 tip