Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
2037:f90513a3dbcd 2038:5c4496ed152d
1 removing b 1 removing b
2 this update spans a branch affecting the following files: 2 this update spans a branch affecting the following files:
3 b 3 b
4 aborting update spanning branches! 4 aborting update spanning branches!
5 (use 'hg merge' to merge across branches or '-C' to lose changes) 5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)