Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1149:f82b084bd904

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: update for new help output format
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 29 Aug 2005 20:37:07 +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)