checkout -m: recreate merge when checking out of unmerged index