Its always an issue because you need to know what values to pass for merge tool so just as a reminder:
C:\Program Files (x86)\KDiff3\kdiff3.exe %base %mine %theirs -o %merged
The only problem with it is that when you exit kdiff3, it remains to be conflicted and you need manually mark as resolved.
Thanks man for this help.
ReplyDeleteYes thanks!
ReplyDelete