mergetool--lib: Make style consistent with git