--- 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