mergetools / gvimdiff3on commit Merge branch 'js/eol-on-ourselves' into maint (7ba4fa5)
   1. "$MERGE_TOOLS_DIR/vimdiff"