Mercurial > hg

diff tests/test-merge-types @ 5710:026eb80060d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update test-merge-types
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:36 -0600
parents 32c2832682a9
children
line wrap: on
line diff
--- a/tests/test-merge-types	Thu Dec 27 22:49:01 2007 -0600
+++ b/tests/test-merge-types	Thu Dec 27 23:55:36 2007 -0600
@@ -20,6 +20,8 @@
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
+else
+    echo "a has no flags (default for conflicts)"
 fi
 
 hg update -C 1
@@ -32,7 +34,6 @@
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
+else
+    echo "a has no flags (default for conflicts)"
 fi
-
-echo "skipped: test is for a known, unfixed bug"
-exit 80