# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1206301024 -3600
# Node ID bbfebf751ac89ac0e5d4bc110a4e3566f9f8a28a
# Parent  bc3dbdb1d430f5d9de2c03153f5646ad51ea2b23
test-imerge: test resolve subcommand

diff -r bc3dbdb1d430 -r bbfebf751ac8 tests/test-imerge
--- a/tests/test-imerge	Sun Mar 23 20:37:02 2008 +0100
+++ b/tests/test-imerge	Sun Mar 23 20:37:04 2008 +0100
@@ -33,6 +33,12 @@
 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 -r bc3dbdb1d430 -r bbfebf751ac8 tests/test-imerge.out
--- a/tests/test-imerge.out	Sun Mar 23 20:37:02 2008 +0100
+++ b/tests/test-imerge.out	Sun Mar 23 20:37:04 2008 +0100
@@ -15,6 +15,12 @@
 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