Merge branch 'jc/push-follow-tag'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"