tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 09 Sep 2005 10:59:05 -0700
changeset 1226 f3837564ed03
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
patchbomb: add TLS and SMTP AUTH support. Original patch from Lee Cantey <lcantey@gmail.com>.

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)