Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2000:6f6e210b38cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add benoit's test for issue148.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 24 Mar 2006 10:31:23 -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)