tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 31 Mar 2006 03:25:35 -0600
changeset 2028 1f1fc418a96c
parent 2019 ced2d3620f95
child 2038 5c4496ed152d
permissions -rw-r--r--
ssh: skip noise generated by remote shell we send a dummy command with known output to get in sync

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or '-C' to lose changes)