view tests/test-merge5.out @ 1231:effff847870f

CONTRIBUTORS update
author mpm@selenic.com
date Fri, 09 Sep 2005 12:19:24 -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)