Enable reuse recorded resolution of conflicted merges

https://www.kernel.org/pub/software/scm/git/docs/git-rerere.html