diff python/hg-merge.py @ 830:6de24d387889

remove old import
author Jeff Hammel <k0scist@gmail.com>
date Sun, 19 Feb 2017 17:55:23 -0800
parents 7bad4b7281f2
children
line wrap: on
line diff