comparison contrib/mergetools.hgrc @ 6409:47f4a47161b4

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 30 Mar 2008 20:31:35 +0200
parents 63e0e57ab157
children 8b67211d9140
comparison
equal deleted inserted replaced
6408:3f5f23ba18bc 6409:47f4a47161b4