diff python/hg-merge.py @ 255:1f7325245dc8

more stubbing
author Jeff Hammel <jhammel@mozilla.com>
date Sun, 16 Dec 2012 22:27:28 -0800
parents 7bad4b7281f2
children
line wrap: on
line diff