CODEWITHSUNDEEP
mercurialkdiff3
user2969259
user2969259

Reputation: 13

mercurial hg and kdiff3

I am in windows. I use Mercurial hg. I made a clone of a project (hg clone) then hg pull another project (hg pull). So mercurial asks me to do a merge of the two projects. And then there is a conflict between the two projects. And now I know what to do because kdiff3 does not open automatically so that I can resolve the conflict.

So if someone had an idea of ​​how I could make kdiff3 opens automatically when mercurial encounter conflict.

Thank you very much and good day.

Upvotes: 0

Views: 2995

Answers (1)

asa
asa

Reputation: 4040

You need to modify your mercurial.ini file as per the instruction in this link:

https://www.mercurial-scm.org/wiki/KDiff3

and setting the parameter cmd.kdiff3 to the path of kdiff executable file.

Upvotes: 0

Related Questions