Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1496:3cf287a03664

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove the deprecated --text (t) option to rawcommit and tag
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 03 Nov 2005 00:43:05 -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)