Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-prompt.t @ 12328:b63f6422d2a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix a bunch of pointless #s in unified tests
author Matt Mackall <mpm@selenic.com>
date Fri, 17 Sep 2010 17:03:08 -0500
parents 7b05cb9ac6d2
children 22f3353bcc36
line wrap: on
line diff
--- a/tests/test-merge-prompt.t	Fri Sep 17 17:03:04 2010 -0500
+++ b/tests/test-merge-prompt.t	Fri Sep 17 17:03:08 2010 -0500
@@ -1,10 +1,9 @@
-# Test for
-#
-#   b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
-#                 (issue897)
-#
-#   840e2b315c1f: Fix misleading error and prompts during update/merge
-#                 (issue556)
+Test for
+b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
+ (issue897)
+
+840e2b315c1f: Fix misleading error and prompts during update/merge
+ (issue556)
 
   $ status() {
   >     [ $? -ne 0 ] && echo "failed."