This is an archive of the discontinued Mercurial Phabricator instance.

merge: remove workaround for issue5020
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Summary

As I explained in the previous commit, I think the filtering added
there is a better fix for the issue, so the workaround from
41f6af50c0d8 (merge: fix crash on criss cross merge with dir move and
delete (issue5020), 2017-01-31) should no longer be needed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 16 2019, 1:16 PM
This revision was automatically updated to reflect the committed changes.