Mercurial > hg

diff tests/test-merge9 @ 6518:92ccccb55ba3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: new command - add basic resolve command functionality - point failed update and merge at resolve
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Apr 2008 12:52:56 -0500
parents dc5920ea12f8
children 5a14a8f3b909
line wrap: on
line diff
--- a/tests/test-merge9	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-merge9	Fri Apr 11 12:52:56 2008 -0500
@@ -23,9 +23,31 @@
 
 # test with the rename on the remote side
 HGMERGE=false hg merge
+hg resolve -l
 
 # test with the rename on the local side
 hg up -C 1
 HGMERGE=false hg merge
 
+echo % show unresolved
+hg resolve -l
+
+echo % unmark baz
+hg resolve -u baz
+
+echo % show
+hg resolve -l
+
+echo % re-resolve baz
+hg resolve baz
+
+echo % after
+hg resolve -l
+
+echo % resolve all
+hg resolve
+
+echo % after
+hg resolve -l
+
 true