make update quieter when nothing is wrong
sometimes when i am going around in my history, i get long lists of
errors from the update command. this patch will fix that. i tried to
make the code style the same like the rest of the code.
%% 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