Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1845:cfe689ab3f06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
author Lee Cantey <lcantey@gmail.com>
date Mon, 06 Mar 2006 21:05:18 -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)