diff i18n/hggettext @ 27458:d39e743e3578

rebase: mention conflict in documentation instead of merge
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:32:15 +0000
parents 80deae3bc5ea
children 2516bba643e7
line wrap: on
line diff