mergetools / gvimdiffon commit Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint (e6f80ae)
   1. "$MERGE_TOOLS_DIR/vimdiff"