SUMMARY: Why does external SVN conflict resolution show literal files comparisons and not recent change deltas?
DETAIL While merging, SVN reports a conflict. That's fine.
However while using launch to examine the conflict, I am shown not just the current conflict but historical conflicts which I have already dealt with. (The conflict is triggered by current conflicts only as you'd expect.) That is, I am shown the equivalent of diff-full and not the handy display-conflict.
For example, in a prior merge of a branch to the trunk, I may deliberately not move over some specific branch code. Now I am being shown this code and asked to make a decision about it but it was so long ago, I am not qualified to make that assessment.
Am I approaching this wrong or is this just a current limitation?
Subversion 1.6 OS X 10.6.4