tests/test-merge5.out
author mcmillen@cs.cmu.edu
Fri, 24 Mar 2006 14:53:23 +0100
changeset 1995 2da2d46862fb
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Spelling fix: "commited" -> "committed"

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)