Merge branch 'da/mergetool-custom'
[git] / t / t5100 / msg0006
1 Here is a patch from A U Thor.
2