Code

mergetool: factor out common code