tests/test-merge4.out

commit: trade O(n^2) file checks for O(n^2) dir checks

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)