Skip to content

Actual 3-way merges inside files with consistent mergeability detection

Georges Racinet requested to merge topic/heptapod/can_hg_merge into branch/heptapod

This fixes #99 (closed), and then changes the Mercurial merge tool so that merges can happen for files that have been modified on both sides of the merge.

Merge request reports