tests: add merge test for changeset 9fe267f77f56...
tests: add merge test for changeset
9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.