Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 02 Apr 2006 18:16:06 +0200
changeset 2038 5c4496ed152d
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
permissions -rw-r--r--
Tell the user the real "hg update -C" command, not just "-C" when aborting.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
mercurial-crew-with-dirclash