Merge branch 'jc/diff-no-index-d-f'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"