Page MenuHomePhabricator

filemerge: add a hacktastic version of internal:merge3 for merge diffs
Needs ReviewPublic

Authored by durin42 on Mon, May 11, 6:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This is a version of merge3 that always reports success, so that
conflict markers get preserved without us having to implement conflict
storage for in-memory merge. Credit to martinvonz for the idea.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage