git-merge: minor fix for no_trivial_merge_strategies.