Merge branch 'af/rebase-i-merge-options'
[git] / t / t5100 / patch0007