Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1389:9b3ef6f3cef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert-repo: fix up octopus merge conversion
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 19:27:35 -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)