comparison tests/test-merge2.out @ 11480:57afaabc87c5 stable

merge with stable
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Tue, 29 Jun 2010 12:18:42 -0300
parents 4b0c9c674707
children
comparison
equal deleted inserted replaced
11479:6e8cf1024497 11480:57afaabc87c5