diff python/hg-merge.py @ 236:1ff683ac0487

oops. i forgot why i didnt do this
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 09 Aug 2012 13:04:17 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff