comparison hgext/hgk.py @ 2799:b550cd82f92a

Move merge code to its own module Pull update and merge3 out of localrepo into merge.py s/self/repo/ Add temporary API function in hg.py Convert all users
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Aug 2006 15:24:41 -0500
parents b5779a04f208
children 345bac2bc4ec 2497fa1c6b76
comparison
equal deleted inserted replaced
2798:8cd3e19bf4a5 2799:b550cd82f92a