Merge branch 'dl/credential-cache-socket-in-xdg-cache'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"