Mercurial > hg > config
diff .fluxbox/styles/Black @ 54:82d24a65cb0d
use meld as merge program
| author | Jeff Hammel <k0scist@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 08:22:49 -0700 |
| parents | 56d0cd1fefda |
| children | 93cc3245bf2b |
| author | Jeff Hammel <k0scist@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 08:22:49 -0700 |
| parents | 56d0cd1fefda |
| children | 93cc3245bf2b |