This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbeec7fc6adec: merge: remove workaround for issue5020
(authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6245?vs=14773&id=1482
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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
https://phab.mercurial-scm.org/
