mergetools / vimdiff2on commit Merge branch 'lw/daemon-log-destination' into next (da91bd5)
   1. "$MERGE_TOOLS_DIR/vimdiff"