Fix parsing og `hg merge` output for Mercurial 4.6 and newer
In Mercurial 4.6 the wording of last line of the output has changed.
This commit updates the parser so it can handle both wordings.
@REM -------
@REM make using Microsoft Visual C compiler
@REM type vcmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
@if not defined VSINSTALLDIR (
call ..\..\rules\vcsetup.bat
)
make.exe -N -f bc.mak -DUSEVC %*