Mercurial > hg

view tests/test-merge5.out @ 1027:cb31576ed3e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emacs: fix up hg-log and hg-diff to operate more uniformly.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 23 Aug 2005 16:46:10 -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)