Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1653:e8a3df8b62b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: show copy/rename links in file history
author Matt Mackall <mpm@selenic.com>
date Sun, 29 Jan 2006 17:10:38 +1300
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)