tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 23 Sep 2005 10:30:41 -0700
changeset 1330 0fcde73dc3ca
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Give ssh a better chance of working on Windows. Switch the type of quotes used for the remote command. Open the pipe in binary mode.

%% no merges expected
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge expected!
merging for b
merging b
%% merge of b expected
merging for b
merging b