diff python/hg-merge.py @ 311:a25eb7e42889

new stub
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 17 May 2013 03:13:11 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff