diff mercurial/merge.py @ 10849:12ffc5ce1291

templater: cache self.defaults.get
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 15:25:08 -0500
parents 0e64d814d7d0
children 7a0d096e221e
line wrap: on
line diff