mergetool fixes

Let's opt in to rerere per repo

init.defaultBranch = main

(0) -300 -100 -30 -10 -3 +3 +10 +30 +100 tip

mercurial