Merge branch 'sb/help-unknown-command-sort-fix'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"