tests/test-merge1.out

fix a bug in dirstate.changes when cwd != repo.root

- use lstat instead of stat
- add a testcase (thanks to Johannes Hofmann)

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