Page MenuHomePhabricator

merge: remove special case for in-memory merge
AbandonedPublic

Authored by durin42 on May 19 2020, 3:53 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

This is now handled by the mergestate object, which knows if mergedriver works.

Diff Detail

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

Event Timeline

durin42 created this revision.May 19 2020, 3:53 PM
durin42 updated this revision to Diff 21615.Jun 11 2020, 12:07 PM
marmoute requested changes to this revision.Jul 31 2020, 12:04 PM
marmoute added a subscriber: marmoute.

According to IRC discussion, this series is not ready for review, so moving it out of yadda.

This revision now requires changes to proceed.Jul 31 2020, 12:04 PM
durin42 abandoned this revision.Oct 2 2020, 2:49 PM