tests/test-conflict.out
author jdc@uwo.ca
Wed, 31 Aug 2005 11:56:58 -0700
changeset 1178 a7abffa4b19f
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Adjust hg-strip and hg-chomp regexps.

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a