Mercurial > hg-stable
diff hgmerge @ 2617:0b4bff2b0ce3
fix bug introduced in b13a98bd078e
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 15 Jul 2006 17:00:23 +0200 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 15 Jul 2006 17:00:23 +0200 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |