tests/test-empty-dir.out

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

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present