Merge branch 'fc/rerere-conflict-style' into maint
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2