tests/test-merge5.out
author mpm@selenic.com
Fri, 19 Aug 2005 21:36:57 -0800
changeset 961 3e11d5038649
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Add --ssh and --remotecmd to push This uses the new setconfig options passing mechanism

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)