mergetools / gvimdiff3on commit Merge branch 'js/icase-wt-detection' into maint (15cef7c)
   1. "$MERGE_TOOLS_DIR/vimdiff"