From patchwork Sun Nov  4 00:55:47 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: tests: conditonalize a difference in test-merge-tools.t on Windows
From: Matt Harbison <mharbison72@gmail.com>
X-Patchwork-Id: 36352
Message-Id: <ff37b1712fa531ead5fd.1541292947@Envy>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 03 Nov 2018 20:55:47 -0400

# HG changeset patch
# User Matt Harbison <matt_harbison@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

diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1957,7 +1957,8 @@ Check that the extra information is prin
   >   --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"'
   merging b
   
-  Running merge tool for b (*/bin/echo): (glob)
+  Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !)
+  Running merge tool for b (*/bin/echo): (glob) (no-windows !)
   - local (working copy): 10:2d1f533d add binary file (#2) tip default
   -          base (base): -1:00000000  default
   -    other (merge rev): 9:1e7ad7d7 add binary file (#1) default