Merge branch 'rj/log-decorate-auto'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"