mergetool fixes

Let's opt in to rerere per repo

init.defaultBranch = main

PlugUpgrade

Add TigLog

permanent stow path

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

mercurial