view tests/test-merge5.out @ 1043:9344f5dd4488

Update tests
author mpm@selenic.com
date Wed, 24 Aug 2005 19:19:35 -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)