mergetools / gvimdiff2on commit Merge branch 'js/bs-is-a-dir-sep-on-windows' (7d26aa3)
   1. "$MERGE_TOOLS_DIR/vimdiff"