mergetools / gvimdiff2on commit Merge branch 'js/name-rev-use-oldest-ref' into maint (9ee8f94)
   1. "$MERGE_TOOLS_DIR/vimdiff"