diff python/hg-merge.py @ 350:52e718567731

minor improvements
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 27 Jun 2013 00:04:12 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff