Mercurial > hg

view tests/test-merge5.out @ 1184:9462df772bc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up failing tests.
author bos@serpentine.internal.keyresearch.com
date Thu, 01 Sep 2005 07:37:49 -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)