Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1277:0bf11906df28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a favicon.ico, small version of the main HG image.
author Ollivier Robert <roberto@keltia.freenix.fr>
date Mon, 19 Sep 2005 22:15:36 +0200
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)