tests/test-conflict.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 21 Jun 2007 10:00:59 +0200
changeset 4661 a7e9b6b1adeb
parent 4385 93a4e72b4f83
permissions -rw-r--r--
Backed out changeset cfa477946181824f4c769580ebf59710090ba08a Only printenv was changed, not the actual execution of hooks. And not setting an empty value might cause problems on platforms which can't always remove variables from the environment.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< my
something else
=======
something
>>>>>>> other
M a