comparison mercurial/context.py @ 3096:54d85098fb82

merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents 345bac2bc4ec
children 81da3c45aabd da85145d4571
comparison
equal deleted inserted replaced
3095:92a0c2200e41 3096:54d85098fb82