mergetools / gvimdiff2on commit Merge branch 'jk/daemon-path-ok-check-truncation' into maint (aa22ef8)
   1. "$MERGE_TOOLS_DIR/vimdiff"