mergetools / gvimdiff3on commit Merge branch 'rs/daemon-fixes' into maint (a8f01f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"