diff python/hg-merge.py @ 300:a1c72313b3df

minor mods
author Jeff Hammel <jhammel@mozilla.com>
date Sat, 11 May 2013 17:55:17 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff