diff mercurial/merge.py @ 3199:ebdb3f616bc0

Add str methods to contexts
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:29:44 -0500
parents a9e75b371315
children e67c22bc8bba
line wrap: on
line diff