[PATCH] tests: conditonalize a difference in test-merge-tools.t on Windows

[Yuya Nishihara]

On Sat, 03 Nov 2018 20:55:47 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1541292604 14400
> #      Sat Nov 03 20:50:04 2018 -0400
> # Node ID ff37b1712fa531ead5fdd34aa3bb7e6fa60af716
> # Parent  8664fdc1cfb3b4a64fdb2a6d138b49fe17fcd0b3
> tests: conditonalize a difference in test-merge-tools.t on Windows

Queued, thanks.