merge: move the bulk of simplemerge into core
- keep existing simplemerge command in contrib
- clean up test interface
#!/bin/shhg initecho a > ahg ci -Am thg mv a bhg ci -Am t1hg debugrename bhg mv b ahg ci -Am t2hg debugrename aecho % test with --revhg debugrename --rev 1 b