diff python/hg-merge.py @ 289:e1a861bbb559

sample file picker
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 10 May 2013 14:25:29 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff