diff mercurial/merge.py @ 3877:5f05157bf9be

spelling fix
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 14 Dec 2006 00:41:11 +0100
parents 46abbed02b2d
children c0a12e6441a5
line wrap: on
line diff