hg + kdiff3 = possible incorrect merges

View: New views
1 Messages — Rating Filter:   Alert me  

hg + kdiff3 = possible incorrect merges

by Tomas Mysik :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi all,
I just updated
http://wiki.netbeans.org/HgHowTos#section-HgHowTos-InstallingMercurial 
because if one uses KDiff3 as a merge program in mercurial, incorrect merges
can happen (my own experience). More information about merge programs in hg
can be found here:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram

Thanks,
Tomas
--
Tomas Mysik
tomas.mysik@...