mergetools / gvimdiff2on commit Merge branch 'tz/credential-authinfo' (ea11711)
   1. "$MERGE_TOOLS_DIR/vimdiff"