comparison hgmerge @ 3592:fffc8a733bf9

Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 31 Oct 2006 13:02:49 +0100
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3580:41989e55fa37 3592:fffc8a733bf9