Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"