rerere: record resolution even if file is not in merge base
[git] / t / t5100 / patch0007