Mercurial > hg
diff contrib/mergetools.hgrc @ 6714:5f339b6a7eff
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 18 Jun 2008 23:45:49 +0200 |
parents | 8b67211d9140 |
children | 8119c1a607c4 |
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 18 Jun 2008 23:45:49 +0200 |
parents | 8b67211d9140 |
children | 8119c1a607c4 |