Mercurial > public > mercurial-scm > hg

diff tests/test-largefiles-update.t @ 27676:1c48f348f2d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: correct language to use working directory
author timeless <timeless@mozdev.org>
date Tue, 05 Jan 2016 22:46:04 +0000
parents 157675d0f600
children 63116d47cc3f
line wrap: on
line diff
--- a/tests/test-largefiles-update.t	Wed Dec 23 21:30:38 2015 +0000
+++ b/tests/test-largefiles-update.t	Tue Jan 05 22:46:04 2016 +0000
@@ -623,7 +623,7 @@
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file .hglf/large1.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ hg status -A large1
   C large1