Mercurial > public > mercurial-scm > hg-stable

diff tests/test-largefiles.t @ 22841:18b3869179f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 14:16:53 -0700
parents 4e2559841d6c
children 51c9196a6bd0
line wrap: on
line diff
--- a/tests/test-largefiles.t	Fri Oct 10 10:34:52 2014 -0400
+++ b/tests/test-largefiles.t	Wed Oct 08 14:16:53 2014 -0700
@@ -1705,7 +1705,7 @@
 - make sure update of merge with removed largefiles fails as expected
   $ hg rm sub2/large6
   $ hg up -r.
-  abort: outstanding uncommitted merges
+  abort: outstanding uncommitted merge
   [255]
 
 - revert should be able to revert files introduced in a pending merge