diff python/hg-merge.py @ 827:a5a339b7fd82

python 3.5
author Jeff Hammel <k0scist@gmail.com>
date Sun, 19 Feb 2017 17:48:52 -0800
parents 7bad4b7281f2
children
line wrap: on
line diff