merge-recursive: leave unmerged entries in the index.