diff tests/test-double-merge.out @ 10183:572dd10fa308

subrepo: mark string for translation and fix case
author Martin Geisler <mg@lazybytes.net>
date Fri, 01 Jan 2010 18:46:24 +0100
parents d8143769e1d4
children ba5e508b5e92
line wrap: on
line diff