comparison tests/test-merge7.t @ 15945:cd42f77d30c4 stable

rebase: drop uppercase in abort message
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Fri, 20 Jan 2012 12:04:45 -0200
parents efdcce3fd2d5
children f2719b387380
comparison
equal deleted inserted replaced
15944:f19d5c852f9b 15945:cd42f77d30c4