Mercurial > hg

diff tests/test-imerge @ 6363:bbfebf751ac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-imerge: test resolve subcommand
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:04 +0100
parents bc3dbdb1d430
children
line wrap: on
line diff
--- 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