Add mergetool support to the classic StGit infrastructure