--- a/tests/test-merge-types Thu Dec 27 22:27:37 2007 -0600
+++ b/tests/test-merge-types Thu Dec 27 22:27:43 2007 -0600
@@ -2,19 +2,18 @@
hg init
echo a > a
-hg ci -Amadd
+hg ci -Amadd # 0
chmod +x a
-hg ci -mexecutable
+hg ci -mexecutable # 1
hg up 0
rm a
ln -s symlink a
-hg ci -msymlink
+hg ci -msymlink # 2
+hg merge --debug
-hg merge
-
-echo % symlink is left parent, executable is right
+echo % symlink is local parent, executable is other
if [ -h a ]; then
echo a is a symlink
@@ -24,9 +23,9 @@
fi
hg update -C 1
-hg merge
+hg merge --debug
-echo % symlink is right parent, executable is left
+echo % symlink is other parent, executable is local
if [ -h a ]; then
echo a is a symlink