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
Showing
t/t6060-merge-index.sh
0 → 100755
想要评论请 注册 或 登录