Mercurial > hg

annotate tests/test-conflict.out @ 7948:de377b1a9a84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move encoding bits from util to encoding In addition to cleaning up util, this gets rid of some circular dependencies.
author Matt Mackall <mpm@selenic.com>
date Fri, 03 Apr 2009 14:51:48 -0500
parents 9fe7e6acf525
children b2310903c462
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
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
2 created new head
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
3 merging a
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2175
diff changeset
4 warning: conflicts during merge.
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 merging a failed!
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7821
9fe7e6acf525 merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents: 6518
diff changeset
7 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
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
8 e7fe8eb3e180+0d24b7662d3e+ tip
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
9 <<<<<<< local
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
10 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
11 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
12 something
4387
93a4e72b4f83 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4365
diff changeset
13 >>>>>>> other
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
14 M a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 4387
diff changeset
15 ? a.orig