view tests/test-merge5.out @ 1266:703783bc09c4

Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
author mpm@selenic.com
date Fri, 16 Sep 2005 14:01:03 -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)