diff python/hg-merge.py @ 269:cbd7651dbd52

add sample example code
author Jeff Hammel <jhammel@mozilla.com>
date Sat, 23 Mar 2013 21:37:56 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff