diff python/hg-merge.py @ 304:7ed290454f50

random cleanup but not much
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 14 May 2013 16:35:56 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff