-
Bug
-
Resolution: Fixed
-
Low
-
2.0.13-beta-1
-
None
-
Severity 3 - Minor
During an external merge, the "Visual Merge In Progress" dialog is shown. Pressing "Abort" returns control to SourceTree as expected. But when I exit the merge tool (without saving), SourceTree marks the file as resolved anyway. It should surely leave it as resolved if Abort was pressed.
- is duplicated by
-
SRCTREEWIN-14248 merge Conflicts considered as "Resolved" even if I pressed "Abort" in the "visual merge in progress" dialog
-
- Closed
-
-
SRCTREEWIN-14284 pressing *SourceTree's* "Abort button" while the merge tool is running does nothing
-
- Closed
-
-
SRCTREEWIN-5687 Using external merge tool workflow is broken.
-
- Closed
-
- is related to
-
SRCTREEWIN-6980 "Visual Merge In Progress" dialog blocks whole app
-
- Closed
-