mergetools / gvimdiff2on commit Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint (cdc55aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"