Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 03 Dec 2007 12:06:21 +0100
changeset 5597 e7f99a3ed008
parent 4387 93a4e72b4f83
child 6004 5af5f0f9d724
permissions -rw-r--r--
hgweb: extract constant to global level
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2175
diff changeset 
     2
 
warning: conflicts during merge.
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     3
 
merging a
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
4387
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4365
diff changeset 
    10
 
<<<<<<< my
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
mercurial