diff python/pastebin.py @ 54:82d24a65cb0d

use meld as merge program
author Jeff Hammel <k0scist@gmail.com>
date Tue, 30 Mar 2010 08:22:49 -0700
parents 6b8573a62cd3
children
line wrap: on
line diff