Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-conflict.out @ 1517:b582dbc16165

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Canonicalize command when using aliases or prefix matching. This makes the norepo check and the help and version command work when not using the canonical name.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 07 Nov 2005 18:39:25 +0100
parents 5a034646e472
children 7544700fd931
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
1 merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
2 merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
3 merging a failed!
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
4 32e80765d7fe+75234512624c+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
6 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
7 something
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
8 M a