mergetools / gvimdiff3on commit Merge branch 'jc/apply-beyond-symlink' into maint (5244a31)
   1. "$MERGE_TOOLS_DIR/vimdiff"