comparison mercurial/ui.py @ 3096:54d85098fb82

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