diff mercurial/templater.py @ 3096:54d85098fb82

merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents 3d6efcbbd1c9
children e18c3d08528d
line wrap: on
line diff