##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: show list of bids for each file in bid-merge in ui.debug()...
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
Jun Wu - - Load All Authors

File last commit:

r30346:9cc438bf default
r46031:ccd3bf44 default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer
/ mercurial / cffi / __init__.py
History | Source | Raw |Copy content |Copy permalink