Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1140:04d52b446e5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't create repo objects in hgwebdir, ui object is enough.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 29 Aug 2005 07:19:02 +0200
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)