view tests/test-merge5.out @ 1383:3d6d45faf8b2

hg verify: add an error reporting helper function
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 10:51:02 -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)