mergetool: style fixes