t6022: ignoring untracked files by merge-recursive when they do not matter