merge-recursive: never leave index unmerged while recursing