tests/test-merge4.t

setup: avoid attempting to invoke the system-wide hg.exe on Windows

On Windows, the executable in the current directory gets priority over anything
in $PATH (both for cmd.exe and MSYS).  That means, the former code was launching
the local hg.exe instead of the system-wide one, if it was previously built.  If
that failed, it then fell back to the local hg code, but run through python.exe.

I'm not sure what it is about ef7119cd4965, but that started throwing up a
messagebox that python37.dll couldn't be loaded.  (And indeed, python37 is not
in $PATH by default.)  Invoking the local hg via the current python avoids that.

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]