diff tests/test-trusted.py.out @ 16967:30cfa286947c

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