Merge branch 'bs/sendemail-tighten-anything-by'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"