diff tests/test-merge4.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 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff