mergetools / vimdiff3on commit Merge branch 'tz/cred-netrc-cleanup' (cf22247)
   1. "$MERGE_TOOLS_DIR/vimdiff"