Can someone please explain the difference between the following two options of Tortoise SVN on conflicted files:
On a side note. Why on earth no one has ever reported this confusing use of terminology as a bug?