Fix lots of exception-related problems.
These have been around since the Big Code Split.
%% 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