Merge branch 'jk/check-everything-connected-is-long-gone' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"