diff python/hg-merge.py @ 287:f890a12d8cf5

add lsdiff override for urls
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 10 May 2013 12:13:30 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff