comparison tests/test-conflict.t @ 12298:f254204d8b8d

tests: unify test-rename-merge1
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 13:43:05 +0200
parents 4c94b6d0fb1c
children f2daa6ab514a
comparison
equal deleted inserted replaced
12297:a424fa60e742 12298:f254204d8b8d