diff python/hg-merge.py @ 234:761e7dfc675e

updates from most recent usage
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 09 Aug 2012 12:54:12 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff