Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-conflict.out @ 908:fcd34a9577e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix tests for new init command
author mpm@selenic.com
date Sun, 14 Aug 2005 21:36:08 -0800
parents 0902ffece4b4
children 5a034646e472
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 + hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
2 + hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
3 + hg commit -m ancestor -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
4 + hg commit -m branch1 -d 0 0
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 + hg co 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
6 + hg commit -m branch2 -d 0 0
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 392
diff changeset
7 + hg up -m 1
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
8 merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
9 merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
10 merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
11 + hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
12 32e80765d7fe+75234512624c+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
13 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
14 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
15 something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
16 + hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
17 M a