I have IntelliJ IDEA 12.1.3 installed and I have trunk and branch in SVN.
I use IDEA to merge from branch to trunk, and call command Subversion->Integrate Directory.
Source 1 is branch, Source 2 is trunk, unticked "Use ancestry", depth "infinity".
The problem is: it marks files without changes as modified (an shows no differences in "Show Diff").
How would I solve that?