Mercurial > hg > config
diff python/html2flux.py @ 54:82d24a65cb0d
use meld as merge program
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Tue, 30 Mar 2010 08:22:49 -0700 |
parents | 069a739d88ad |
children | fbc033540a34 |
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Tue, 30 Mar 2010 08:22:49 -0700 |
parents | 069a739d88ad |
children | fbc033540a34 |