Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1704:c2755eba8631

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
display revision numbers revision numbers are useful for orientation when browsing through the changelog
author Johannes Stezenbach <js@linuxtv.org>
date Mon, 06 Feb 2006 17:35:22 -0600
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)