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