mergetools / vimdiff3on commit Merge branch 'rs/daemon-fixes' (dc11fc2)
   1. "$MERGE_TOOLS_DIR/vimdiff"