( )⚙ D1234 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

This is an archive of the discontinued Mercurial Phabricator instance.

rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco updated this revision to Diff 4044.Dec 1 2017, 3:09 AM
phillco updated this revision to Diff 4180.Dec 7 2017, 4:22 PM
durin42 accepted this revision.Dec 7 2017, 4:33 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:33 PM
phillco updated this revision to Diff 4199.Dec 7 2017, 4:44 PM
This revision was automatically updated to reflect the committed changes.