martinvonz added inline comments. INLINE COMMENTS
> durin42 wrote in histedit.py:1974-1993 > They'll correctly cause a conflict, but I trust the merge code to efficiently > figure out what paths to look up, rather than (eg) enumerating a large build/ > hierarchy that's wholly ignored. Ah, now I see what you mean. There are also config options for `merge.checkunknown`, `merge.checkignored`, and `experimental.merge.checkpathconflicts` (and maybe others) that my proposal would miss. So I agree with doing it the way you have. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6882/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6882 To: durin42, #hg-reviewers Cc: martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
