1. Start merging changes from another branch with some conflicting files as a result (Git is used).
2. Launch external merge tool via context menu in "Working Copy Changes"
Problem: if I decide to quit external merge tool for some reason without finishing merge, the file from "Working Copy Changes" is moved to "Staged Changes". If I decide to restart merge later, I need to memorize file name and find it in "Staged Changes" first.

Suggestion: either button "Abort" in "View Merge In Progress" should prevent file from being moved to "Staged Changes" or there should be another way to do it.