builtin/merge.c: fix a bug with trivial merges