Mercurial > hg > config
diff .fluxbox/keys @ 54:82d24a65cb0d
use meld as merge program
| author | Jeff Hammel <k0scist@gmail.com> | 
|---|---|
| date | Tue, 30 Mar 2010 08:22:49 -0700 | 
| parents | 512ceeb0ec90 | 
| children | b3a633f05444 | 
| author | Jeff Hammel <k0scist@gmail.com> | 
|---|---|
| date | Tue, 30 Mar 2010 08:22:49 -0700 | 
| parents | 512ceeb0ec90 | 
| children | b3a633f05444 |