comparison mercurial/fancyopts.py @ 85:58a1a0425c9b

Fix merge bug, I hope
author mpm@selenic.com
date Tue, 17 May 2005 11:40:45 -0800
parents 9117c6561b0b
children 2e87f04880ab
comparison
equal deleted inserted replaced
84:b2e3528115da 85:58a1a0425c9b