Mercurial > hg

changeset 40486:ff37b1712fa5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: conditonalize a difference in test-merge-tools.t on Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 03 Nov 2018 20:50:04 -0400
parents 8664fdc1cfb3
children 78e5b9d815fa
files tests/test-merge-tools.t
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Thu Nov 01 17:12:22 2018 -0400
+++ b/tests/test-merge-tools.t	Sat Nov 03 20:50:04 2018 -0400
@@ -1957,7 +1957,8 @@
   >   --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