Merge branch 'jk/diff-color-moved-fix' into maint
[git] / t / t5100 / msg0015