mergetools / gvimdiff3on commit Merge branch 'js/normalize-path-copy-ceil' into maint (07ec05d)
   1. "$MERGE_TOOLS_DIR/vimdiff"