tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.

merge: remove old pre-audit code checking for absolute paths Audit will handle this in a more elegant way.

merge: drop reference to file contents immediately after write Like 7d2aaeea67ed this reduces memory usage on large merges.