diff mercurial/filelog.py @ 3096:54d85098fb82

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