Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1594:a329e0fda2ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 16 Dec 2005 11:13:08 -0600
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)