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