This is an archive of the discontinued Mercurial Phabricator instance.

rebase: set custom conflict label for base commit

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:31 AM
Alphare added a subscriber: Alphare.

Thanks, this is something I've always found could use a more explicit name

This revision is now accepted and ready to land.Jan 24 2022, 5:31 AM
This revision was automatically updated to reflect the committed changes.