diff python/hg-merge.py @ 221:d213d21e371b

fix silly mistakes
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 08 May 2012 08:30:36 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff