Advice on merge tool

[Isaac Jurado]

>From kdiff3's command line help:

    --auto              No GUI if all conflicts are auto-solvable. (Needs
-o file)

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.vrany at 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 at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial
>



-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20161106/e0b2e4ae/attachment-0002.html>