Mercurial > public > mercurial-scm > hg

diff tests/test-resolve.out @ 7734:9f73bddb9d0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reset mergestate after commit
author Martin Geisler <mg@daimi.au.dk>
date Thu, 25 Dec 2008 10:42:01 +0100
parents
children 9fe7e6acf525
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-resolve.out	Thu Dec 25 10:42:01 2008 +0100
@@ -0,0 +1,8 @@
+adding file
+% create a second head
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
+% failing merge
+0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+use 'hg resolve' to retry unresolved file merges
+% resolve -l, should be empty