tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 30 Aug 2005 23:16:15 -0700
changeset 1171 a425bb927ede
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Sort items in each hgrc section. Add web/description.

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)