Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1864:7a09785d3237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix manifest view on Windows
author Lee Cantey <lcantey@gmail.com>
date Wed, 08 Mar 2006 11:20:39 -0800
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)