Fix an hg copy/move bug. Failed if file being copied or moved not in tip.
%% no merges expected%% merge of b expectedmerging for bmerging b%%Contents of b should be "this is file b1"This is file b1%% merge expected!merging for bmerging b%% merge of b expectedmerging for bmerging b