comparison mercurial/i18n.py @ 8733:f8be48c6b08c

merge: simplify flag merging code slightly
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents b87a50b7125c
children 8982eb292cb5
comparison
equal deleted inserted replaced
8732:3507f6c7715c 8733:f8be48c6b08c