diff python/hg-merge.py @ 404:fb304dcd1e64

factor to its own method
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 30 Jul 2013 10:35:47 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff