--- a/tests/test-conflict Thu Aug 12 19:49:58 2010 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-hg init
-echo "nothing" > a
-hg add a
-hg commit -m ancestor -d "1000000 0"
-echo "something" > a
-hg commit -m branch1 -d "1000000 0"
-hg co 0
-echo "something else" > a
-hg commit -m branch2 -d "1000000 0"
-hg merge 1
-hg id
-cat a
-hg status
--- a/tests/test-conflict.out Thu Aug 12 19:49:58 2010 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
-merging a
-warning: conflicts during merge.
-merging a failed!
-0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
-e7fe8eb3e180+0d24b7662d3e+ tip
-<<<<<<< local
-something else
-=======
-something
->>>>>>> other
-M a
-? a.orig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-conflict.t Thu Aug 12 20:02:59 2010 +0900
@@ -0,0 +1,32 @@
+ $ hg init
+ $ echo "nothing" > a
+ $ hg add a
+ $ hg commit -m ancestor -d "1000000 0"
+ $ echo "something" > a
+ $ hg commit -m branch1 -d "1000000 0"
+ $ hg co 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ echo "something else" > a
+ $ hg commit -m branch2 -d "1000000 0"
+ created new head
+
+ $ hg merge 1
+ merging a
+ warning: conflicts during merge.
+ merging a failed!
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+
+ $ hg id
+ e7fe8eb3e180+0d24b7662d3e+ tip
+
+ $ cat a
+ <<<<<<< local
+ something else
+ =======
+ something
+ >>>>>>> other
+
+ $ hg status
+ M a
+ ? a.orig