diff tests/test-simplemerge-cmd.out @ 12298:f254204d8b8d

tests: unify test-rename-merge1
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 13:43:05 +0200
parents e1f4343db740
children
line wrap: on
line diff