Mercurial > public > mercurial-scm > hg-stable

diff tests/test-fetch.t @ 24368:55fd99a23fdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: use an abort hint where appropriate
author Yuya Nishihara <yuya@tcha.org>
date Tue, 17 Mar 2015 20:36:33 +0900
parents f1eaf03dd608
children 701df761aa94
line wrap: on
line diff
--- a/tests/test-fetch.t	Tue Mar 17 20:41:52 2015 +0900
+++ b/tests/test-fetch.t	Tue Mar 17 20:36:33 2015 +0900
@@ -339,7 +339,8 @@
   marked working directory as branch topic
   (branches are permanent and global, did you want a bookmark?)
   $ hg -R n2 fetch -m merge n1
-  abort: working directory not at branch tip (use "hg update" to check out branch tip)
+  abort: working directory not at branch tip
+  (use "hg update" to check out branch tip)
   [255]
 
 parent should be 0 (fetch did not update or merge anything)