diff python/hg-merge.py @ 313:d6587ced0f07

need this alias for no more typing
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 24 May 2013 12:39:45 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff