mergetools / vimdiff3on commit Merge branch 'rs/refresh-beyond-symlink' into maint (92ea1ac)
   1. "$MERGE_TOOLS_DIR/vimdiff"