diff mercurial/simplemerge.py @ 12030:927d63be166b stable

context: mark string for translation
author Martin Geisler <mg@lazybytes.net>
date Wed, 25 Aug 2010 13:29:46 +0200
parents 08a0f04b56bd
children 81c4e18c7cee
line wrap: on
line diff