diff contrib/simplemerge @ 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 659f34b833b9
children cba222f01056
line wrap: on
line diff