mergetools / gvimdiff2on commit Merge branch 'jk/credential-plug-leak' into maint (f5678f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"