comparison tests/test-merge-local @ 10585:37db57bc7fd7 stable

Merge with hg-i18n
author Martin Geisler <mg@lazybytes.net>
date Thu, 04 Mar 2010 10:05:12 +0100
parents 46280c004f22
children 4c94b6d0fb1c
comparison
equal deleted inserted replaced
10581:3fb2f7cb5ea5 10585:37db57bc7fd7