rerere: record resolution even if file is not in merge base