At Thu, 16 Aug 2018 19:03:30 +0900, Yuya Nishihara wrote: > > On Thu, 16 Aug 2018 03:35:37 +0900, FUJIWARA Katsunori wrote: > > +``strict-capability-check`` > > + Whether capabilities of internal merge tools are checked strictly > > + or not, while examining rules to decide merge tool to be used. > > + (default: False) > > + > > ``merge-patterns`` > > ------------------ > > > > diff --git a/mercurial/help/merge-tools.txt b/mercurial/help/merge-tools.txt > > --- a/mercurial/help/merge-tools.txt > > +++ b/mercurial/help/merge-tools.txt > > @@ -80,10 +80,14 @@ step specified via binary symlink > > ==== =============== ====== ======= > > 1. --tool o o > > 2. HGMERGE o o > > -3. merge-patterns o x > > -4. ui.merge x x > > +3. merge-patterns o (*) x (*) > > +4. ui.merge x (*) x (*) > > ==== =============== ====== ======= > > > > +If ``merge.strict-capability-check`` configuration is true, Mercurial > > +checks capabilities of internal merge tools strictly in (*) cases > > +above. It is false by default for backward compatibility. > > IIUC, strict-capability-check is also applied to external tools while picking > tool for a binary file.
You are right. I'll revise that. -- ---------------------------------------------------------------------- [FUJIWARA Katsunori] fo...@lares.dti.ne.jp _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
