diff python/hg-merge.py @ 380:5b94b85763a0

add alias to actually reset the tree
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 25 Jul 2013 04:48:20 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff