mergetools / gvimdiff3on commit Merge branch 'js/mingw-test-push-unc-path' (e51058f)
   1. "$MERGE_TOOLS_DIR/vimdiff"