git-merge knows some strategies want to skip trivial merges