Issue 370: can stop/abort merge http://bitbucket.org/tortoisehg/stable/issue/370/can-stop-abort-merge
fabse on Mon, 6 Jul 2009 15:58:31 +0200: Changes: content: repo 1 changed a file a.txt repo 2 deleted file a.txt During the merge thg aks if I want to change file or delete. Thats Ok. But there was no cancel button. So I just clicked the X to close this question dialog, because I was not sure about my merge. After that the hg merge windows is still open and doing something (green progress bar). Pressing stop has no effect. I can just kill the task... -> repo 1 changed a file a.txt repo 2 deleted file a.txt During the merge thg aks if I want to change file or delete. Thats Ok. But there was no cancel button. So I just clicked the X to close this question dialog, because I was not sure about my merge. After that the hg merge windows is still open and doing something (green progress bar). Pressing stop has no effect. I can just kill the task... -- This is an issue notification from bitbucket.org. You are receiving this either because you are the owner of the issue, or you are following the issue. ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
