D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM

2018-01-05 Thread durham (Durham Goode)
durham added inline comments. INLINE COMMENTS > rebase.py:812 > +elif (ui.config('experimental', 'mergedriver') and > + ui.configbool('rebase', > 'experimental.inmemory.nomergedriver')): > +whynotimm = 'mergedriver enabled' I think we probably want IMM disabled

D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM

2018-01-05 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This gives us an easy way to ensure IMM is disabled automatically if the user configures a mergedriver script. REPOSITORY rHG Mercurial REVISION DETAIL