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

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
hg history
hg manifest
hg cat a
hg verify