Merge branch 'cb/log-follow-with-combined'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"