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
#header## HG changeset patch# User #author## Date #date|hgdate## Node ID #node##parent%changesetparent##desc##diff#