diff python/hg-merge.py @ 307:655a40db0977

ah, the magic switch
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 16 May 2013 11:25:10 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff