Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 7281:f96c20e9b56a
fix missing import, spotted by pychecker
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 28 Oct 2008 20:14:45 +0100 |
parents | 865c5be0f8df |
children | 89207edf3973 |