comparison mercurial/merge.py @ 21793:e0b29a0c36c4

gendoc: restore use of callable() since it was readded in Python 3.2
author Augie Fackler <raf@durin42.com>
date Mon, 23 Jun 2014 09:23:57 -0400
parents bde505f47141
children 46308fadaa15 b27c3beaaf30
comparison
equal deleted inserted replaced
21792:e15c991fe2ec 21793:e0b29a0c36c4