mergetools / vimdiff2on commit Merge branch 'ew/daemon-socket-keepalive' into maint (172b811)
   1. "$MERGE_TOOLS_DIR/vimdiff"