Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[git] / t / t5100 / msg0009
1 This is to fix diff-format documentation.
2