Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"