Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1378:a0fcfbbf52bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make diff dates be epoch for add/remove
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 04 Oct 2005 11:21:48 -0700
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)