tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 22 Sep 2005 21:15:57 -0700
changeset 1317 008d3666bf41
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Print commit time/date from perspective of committer. Previously, it was printed in the time zone of the reader, but with the committer's time zone offset. It is now consistent.

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