--- a/tests/test-record Sun May 30 23:24:10 2010 +0200
+++ b/tests/test-record Mon May 31 13:55:47 2010 +0200
@@ -301,9 +301,20 @@
EOF
echo; hg tip --config diff.git=True -p
+cd ..
+
+echo % abort early when a merge is in progress
+hg up 4
+touch iwillmergethat
+hg add iwillmergethat
+hg branch thatbranch
+hg ci -m'new head'
+hg up default
+hg merge thatbranch
+echo; hg record -m'will abort'
+hg up -C
echo % with win32ext
-cd ..
echo '[extensions]' >> .hg/hgrc
echo 'win32text = ' >> .hg/hgrc
echo '[decode]' >> .hg/hgrc