view tests/test-merge5.out @ 928:6f2c3bcbfaaf

hg incoming/outgoing: fix tests and update man page
author mpm@selenic.com
date Tue, 16 Aug 2005 19:27:46 -0800
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)