It is easier to use Kdiff to merge files. Some options should be added to do so.

In Tortoise > Settings, put the following parameters :

kdiff3.exe %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs