diff tests/test-simplemerge.py @ 34950:cffc8a22ce0c stable

merge with i18n
author Augie Fackler <augie@google.com>
date Wed, 01 Nov 2017 16:07:33 -0400
parents 68c43a416585
children f0b6fbea00cf
line wrap: on
line diff