Hello,
I also have to strip duplicate HEADs out. So we do the following:
run 0: kill dups
run 1: kill HEADs which are referenced in the history of other HEADs
run 2: do the merging (still don't know to what I should set the local
HEAD to the 'left' or 'right' part. Maybe we should create temporary
commit object so that 'merge-base' can better work on them?
Thomas