diff python/hg-merge.py @ 351:971e7deca495

got --print working, maybe
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 27 Jun 2013 02:01:32 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff