mergetools / gvimdiff3on commit Merge branch 'sg/completion-commit-cleanup' (54a17cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"