diff python/hg-merge.py @ 369:11cf7018ebff

new crappy package for helping me with http://k0s.org/portfolio/python/python-tools.txt
author Jeff Hammel <jhammel@mozilla.com>
date Sun, 21 Jul 2013 05:27:28 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff