Mercurial > hg > pyhgsh

annotate tests/test-conflict.out @ 1345:c5594ff3f95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: Allow specifying hgk path in [hgk]path
author mpm@selenic.com
date Fri, 23 Sep 2005 19:41:45 -0700
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