Merge branch 'jk/merge-one-file-working-tree' into maint

* jk/merge-one-file-working-tree: merge-one-file: fix broken merges with alternate work trees add tests for merge-index / merge-one-file