HomePhabricator

merge: show list of bids for each file in bid-merge in ui.debug()

Authored by pulkit.

Description

merge: show list of bids for each file in bid-merge in ui.debug()

Earlier, we were showing the list of bids only when we were ambiguously picking.
However, the cases where we unambiguously picked a side may not always be
correct and need to be fixed.

Having list of bids for all files will be helpful in debugging.

Differential Revision: https://phab.mercurial-scm.org/D8966

Details

Committed
pulkitWed, Aug 26, 7:50 AM
Differential Revision
D8966: merge: show list of bids for each file in bid-merge in ui.note()
Parents
rHG4532e7ebde4d: merge with stable
Branches
Unknown
Tags
Unknown