diff tests/test-bad-pull.t @ 40486:ff37b1712fa5

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 5abc47d4ca6b
children ebee234d952a
line wrap: on
line diff