diff -r d073f4c70575 -r 1c48f348f2d0 tests/test-largefiles-update.t --- 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