if I try to resolve the conflicts by using "Launch External Merge Tool"
And then I change my mind and I decide I prefer to solve the conflicts some other way, so I press "Abort" here:
The file should remain in its current state and nothing should happen to the repository.
Instead, even If I already pressed "Abort", the very same moment I close the external tool the file gets staged and conflicts get considered as resolved, even if I didn't do anything to solve them.
- duplicates
-
SRCTREEWIN-6981 External merge: Abort doesn't work
-
- Closed
-