Mercurial > hg

diff tests/test-confused-revert.t @ 14721:4fcde634f5e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: be more helpful on uncommitted merges BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: $ hg revert abort: no files or directories specified (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 22 Jun 2011 15:34:33 +0200
parents 88a53081fb21
children a934b9249574
line wrap: on
line diff
--- a/tests/test-confused-revert.t	Wed Jun 22 10:13:44 2011 +0200
+++ b/tests/test-confused-revert.t	Wed Jun 22 15:34:33 2011 +0200
@@ -60,7 +60,7 @@
 
   $ hg revert
   abort: no files or directories specified
-  (use --all to discard all changes)
+  (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
   [255]
 
 Revert should be ok now: