Merge branch 'tm/line-log-first-parent'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"