Mercurial > hg

diff tests/test-merge5.out @ 2038:5c4496ed152d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tell the user the real "hg update -C" command, not just "-C" when aborting.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 02 Apr 2006 18:16:06 +0200
parents ced2d3620f95
children b2ae81a7df29
line wrap: on
line diff
--- a/tests/test-merge5.out	Sun Apr 02 08:19:41 2006 +0200
+++ b/tests/test-merge5.out	Sun Apr 02 18:16:06 2006 +0200
@@ -2,4 +2,4 @@
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use 'hg merge' to merge across branches or '-C' to lose changes)
+(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)