Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1850:05f6c0d1bad8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hide debug commands in ambiguous command list, unless no normal command matches. This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'. Based on a patch by TK Soh.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Mar 2006 08:46:19 +0100
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)