Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"