Merge branch 'jk/index-pack-wo-repo-from-stdin'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"