Mercurial > hg

annotate tests/test-conflict.out @ 6101:abb1c451a88e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 13 Feb 2008 00:40:18 +0100
parents 5af5f0f9d724
children 4b0c9c674707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
2 merging a
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2175
diff changeset
3 warning: conflicts during merge.
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
4 merging a failed!
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
6 There are unresolved merges, you can redo the full merge using:
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
7 hg update -C 2
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
8 hg merge 1
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
9 e7fe8eb3e180+0d24b7662d3e+ tip
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
10 <<<<<<< local
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
11 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
12 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
13 something
4387
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4365
diff changeset
14 >>>>>>> other
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
15 M a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
16 ? a.orig