tests/test-conflict.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 15 Feb 2006 10:49:30 -0800
changeset 1730 0f1d2c75db5e
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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