tests/test-hgignore.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

--
A dir/b.o
? a.c
? a.o
? dir/c.o
? syntax
--
abort: .hgignore: invalid pattern (relre): *.o
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
.hgignore: ignoring invalid syntax 'invalid'
A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
--
A dir/b.o
--
A b.o