[PATCH] test-merge-tools: adapt for Windows

[Mads Kiilerich]

Adrian Buehlmann wrote, On 06/15/2012 05:41 PM:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1339774353 -7200
> # Node ID 2d1a443955d86a9d85e10b27ce056320f45da288
> # Parent  b29a0ca3739efde5edba291ba17ef014e12f4046
> test-merge-tools: adapt for Windows

Pushed to crew, thanks.

/Mads