diff tests/test-merge6.t @ 19660:86ce68c1ccb8

basefilectx: use basectx __str__ instead of duplicating logic This change allows us to only rely on one place to convert a context to a string which will help eliminate duplicate code in context.py
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 15 Aug 2013 13:31:17 -0500
parents f2719b387380
children 2428e8ec0793
line wrap: on
line diff