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
adding a1 files updated, 0 files merged, 0 files removed, 0 files unresolvedadding bpushing to ../aabort: could not lock repository ../a: Permission denied