-
Bug
-
Resolution: Fixed
-
High
-
None
-
1.6.1
-
None
-
Severity 3 - Minor
It seems to me that if I have a merge conflict and I select "Resolve Using Theirs..." source tree actually resolves using my changes, and if I select "Resolve Using Mine..." source tree actual resolves using theirs!