Merge branch 'bc/checkout-tracking-name-plug-leak'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"