Kdiff3 constantly missing a closing tag when merging XML files. If you want to keep changes from both local and remote branches. I've attached screenshot that shows the issue.
