Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[git] / t / t5100 / msg0006
1 Here is a patch from A U Thor.
2