Skip to content

hg-merge: implement a merge on Mercurial side

Georges Racinet requested to merge topic/heptapod/hg-merge into branch/heptapod

If a merge is needed (i.e. if the branches are different, or if the heads diverged), a merge changeset is created and published.

Else, the merged changeset is just published.

Edited by Georges Racinet

Merge request reports