view tests/test-merge1.out @ 1314:d37a46859acd

Fix default clone destination

The default clone wasn't working:

$ hg clone hg
abort: repository hg/.hg not found!

This was because we were creating the destination directory from the
default, then checking whether it existed to determine whether to
expand the path.

%% 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