Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"