Merge branch 'lm/squelch-bg-progress'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"