merge: add stubs for preprocess and conclude steps of merge driver
The exact semantics for what should happen (particularly with respect to error
handling) are still a bit hard to pin down, so I think it's better to
experiment with it as an extension for now. For now this stub will act as a
convenient point for extensions to hook on.
$ hg init repo
$ cd repo
$ touch foo
$ hg ci -Am 'add foo'
adding foo
$ hg up -C null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
this should be stored as a delta against rev 0
$ echo foo bar baz > foo
$ hg ci -Am 'add foo again'
adding foo
created new head
$ hg debugindex foo
rev offset length ..... linkrev nodeid p1 p2 (re)
0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re)
$ cd ..