diff .fluxbox/init @ 54:82d24a65cb0d

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