Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"