What I did A coworker saw the necessity to add the same files to both this branch and the trunk. However, he also comitted changes to the added files afterwards. I merged the content of the trunk into this branch (auto merge with dialog defaults, the branch working copy was updated beforehand). There were of course tree conflicts for the files added to the branch and the trunk. I clicked on the replace and merge option.
What I expected I expected to see the difference between the newly replaced file and the file (as contained in the branch). Individual lines should be flagged as conflict which I would resolve manually. What I got The whole file was marked as a single conflicting block. Further remarks - I first tried to do the merge in an older version (1.12.0.28568) and then updated to the current version (1.13.1.28686) and tried again. The issue persists in the current version. - System (Win10) and program version are both 64bit - I used the default Tortoise diff editor -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/add82149-5fcb-456a-9a41-877fdec6562c%40googlegroups.com.
