diff tests/test-merge5.t @ 16967:30cfa286947c

test-merge-tools: adapt for Windows
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 15 Jun 2012 17:32:33 +0200
parents 610873cf064a
children 6da47b655d97
line wrap: on
line diff