diff mercurial/merge.py @ 3799:58133ba5847d

Allow topics to be callables
author Matt Mackall <mpm@selenic.com>
date Tue, 05 Dec 2006 16:28:56 -0600
parents 6398ff7cb705
children 46abbed02b2d
line wrap: on
line diff