comparison mercurial/merge.py @ 5488:247af577fe29

fix typo in convert help text, update test
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 05 Nov 2007 20:15:33 +0100
parents f9c2917a9f7a
children 3ab405e070bb
comparison
equal deleted inserted replaced
5487:7a64931e2d76 5488:247af577fe29