Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1874:a84829140fb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inherit config from real parentui and don't use ConfigParser internals. Added comments for the meaning of parentui.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 10 Mar 2006 11:06:45 +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)