tests/test-merge5.out
author bos@serpentine.internal.keyresearch.com
Tue, 23 Aug 2005 14:51:52 -0700
changeset 1011 d06420c90d8b
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Emacs: search for hg in path before looking in funny places.

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)