tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 25 Oct 2005 16:31:38 -0700
changeset 1450 199bb2b4ed4a
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Add Benoit to CONTRIBUTORS

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)