diff mercurial/fancyopts.py @ 2921:addb58e3b41c

redo merge with mpm. previous merge at ef8ee4477019 was bad.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 16 Aug 2006 10:52:19 -0700
parents bf4e7ef08741
children eb0b4a2d70a9
line wrap: on
line diff