mergetools / gvimdiff3on commit Merge branch 'js/ming-strftime' into next (a9ca817)
   1. "$MERGE_TOOLS_DIR/vimdiff"