# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2008-03-23 19:37:04
# Node ID bbfebf751ac89ac0e5d4bc110a4e3566f9f8a28a
# Parent  bc3dbdb1d430f5d9de2c03153f5646ad51ea2b23

test-imerge: test resolve subcommand

diff --git a/tests/test-imerge b/tests/test-imerge
--- a/tests/test-imerge
+++ b/tests/test-imerge
@@ -33,6 +33,12 @@ hg -v imerge st
 echo % next
 hg imerge next
 
+echo % resolve and unresolve
+hg imerge resolve foo
+hg -v imerge st
+hg imerge unresolve foo
+hg -v imerge st
+
 echo % merge next
 hg --traceback imerge
 
diff --git a/tests/test-imerge.out b/tests/test-imerge.out
--- a/tests/test-imerge.out
+++ b/tests/test-imerge.out
@@ -15,6 +15,12 @@ merging e6da46716401 and 30d266f502e7
 U foo (foo2)
 % next
 foo
+% resolve and unresolve
+merging e6da46716401 and 30d266f502e7
+R foo (foo2)
+all conflicts resolved
+merging e6da46716401 and 30d266f502e7
+U foo (foo2)
 % merge next
 merging foo and foo2
 all conflicts resolved