mergetools / gvimdiff2on commit Merge branch 'mm/credential-libsecret' (bfe800c)
   1. "$MERGE_TOOLS_DIR/vimdiff"