diff python/hg-merge.py @ 397:11ac996b9c49

make at least a pretend stub
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 30 Jul 2013 00:04:34 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff