add --debug to test-merge-types

tests/test-merge-types

@@ -1,39 +1,38 b''
 #!/bin/sh
 
 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
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
 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
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
 fi
 
 echo "skipped: test is for a known, unfixed bug"
 exit 80