On Sun, 2016-11-06 at 21:35 +0100, Isaac Jurado wrote: > From kdiff3's command line help: > > --auto No GUI if all conflicts are auto-solvable. > (Needs -o file) >
ThanksI have tried this, but the problem is when there actually *is* a conflict it cannot solvet, then it opens an UI and waits for user input. I need it to exit with proper exit code in that case, indicating to mercurial that merge failed. Jan > So I guess it's just a matter of properly configuring kdiff3 in > ~/.hgrc. For example, I have the following: > > [merge-tools] > kdiff3.priority = 5 > kdiff3.args = --auto --L1 Base --L2 Local --L3 Other $base $local > $other -o $output > kdiff3.fixeol = True > kdiff3.gui = True > kdiff3.premerge = True > kdiff3.diffargs = --L1 '$plabel1' --L2 '$clabel' $parent $child > > I hope it works for you. > > Cheers. > > > On Sun, Nov 6, 2016 at 9:32 AM, Jan Vrany <jan.vr...@fit.cvut.cz> > wrote: > > Hi there, > > > > I know this is not strictly speaking a Mercurial concern, but > > maybe some of you may know... > > > > I'm looking for a good non-interactive 3-way merge tool. > > > > Background: > > I have an automatic job that merges "default" branch into "my" > > branch. So far I'm using Mercurial's builtin merge, but it often > > fails to merge. When using KDiff3, it often succeeds and most of > > the time is correct. So I;m quite happy with KDiff3's algorithm > > (which is somehow "better" in my case). > > > > The problem is that KDuff3 cannot be (or - I don't know how) > > configured to be completely non-interactive. I mean, when its > > merging magic fails, it opens a window and waits for the user > > which is not what I want (since I run this as a CI job). > > > > Any ideas? Preferably Linux, if it would be Windows-only, fine with > > me. > > > > Thanks a lot! > > > > Jan > > _______________________________________________ > > Mercurial mailing list > > Mercurial@mercurial-scm.org > > https://www.mercurial-scm.org/mailman/listinfo/mercurial > > > > > _______________________________________________ Mercurial mailing list Mercurial@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial
