Merge branch 'tz/credential-authinfo'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"