Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1349:c6295d2a361e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -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)