Merge branch 'da/mergetool-delete-delete-conflict'
[git] / t / t5100 / patch0007