Mercurial > hg
comparison hgweb.cgi @ 45459:ccd3bf4490c1
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
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 26 Aug 2020 17:20:53 +0530 |
parents | d58a205d0672 |
children | c102b704edb5 |
comparison
equal
deleted
inserted
replaced
45458:4532e7ebde4d | 45459:ccd3bf4490c1 |
---|