merge-one-file: leave unmerged index entries upon automerge failure.