Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1288:9a625fbfa220

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn the win32 README into a HTML file for now.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 21 Sep 2005 00:20:20 -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)