t / t5100 / msg0001on commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
   1Here is a patch from A U Thor.
   2