Mercurial > hg

changeset 7982:cab4a521a3fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: explain when to use resolve -m
author Martin Geisler <mg@daimi.au.dk>
date Sat, 04 Apr 2009 18:31:01 +0200
parents 20df260ae301
children 7b813bdbd5d0
files mercurial/commands.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Apr 04 18:03:03 2009 +0200
+++ b/mercurial/commands.py	Sat Apr 04 18:31:01 2009 +0200
@@ -2343,8 +2343,13 @@
     revisions preserved from the last update or merge. To attempt to
     resolve all unresolved files, use the -a switch.
 
+    If a conflict is resolved manually, please note that the changes
+    will be overwritten if the merge is retried with resolve. The -m
+    switch should be used to mark the file as resolved.
+
     This command will also allow listing resolved files and manually
-    marking and unmarking files as resolved.
+    marking and unmarking files as resolved. All files must be marked
+    as resolved before the new commits are permitted.
 
     The codes used to show the status of files are:
     U = unresolved