Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1602:fb4149eebdd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strictly adher to 80 chars per line
author Muli Ben-Yehuda <mulix@mulix.org>
date Wed, 28 Dec 2005 00:27:05 -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)