Affects Version/s: 1.9.4, 1.9.5
Fix Version/s: 1.10.0
Windows, TortoiseSVN, Command line
Bug confirmed by Branko Čibej <firstname.lastname@example.org> on users mailing list.
Quick verbal description of how to recreate the issue:
-Create a repository (with trunk/tags/branches structure),
-Create branch1 in /branches/branch1, and checkout.
-Create and checkout branch2.
-Create file.txt in Trunk + add + commit.
-Merge trunk changes into branch1 and commit.
-Merge trunk changes into branch2 and commit.
-Merge branch1 changes into branch2, gives me a Tree conflict with file.txt.