comparison .fluxbox/menu @ 54:82d24a65cb0d

use meld as merge program
author Jeff Hammel <k0scist@gmail.com>
date Tue, 30 Mar 2010 08:22:49 -0700
parents 4674cf608131
children 1096fddc22a3
comparison
equal deleted inserted replaced
53:bd91a6bc85cd 54:82d24a65cb0d