diff mercurial/merge.py @ 5268:fae670ee6c6d

kill lonely docstring
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 30 Aug 2007 23:54:01 +0200
parents 90d9ec0dc69d
children 17ed9b9a0d03
line wrap: on
line diff