diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index cc26b0780882b6e8bde122c2a724d110f439d84f..283e4915e928df0c188d8ed2ec49e49eeed3b519 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
_O {
continue; # and pray it works!
}
+ _U -
U? {
error_popup [mc "You are in the middle of a conflicted merge.
catch {file delete [gitdir MERGE_HEAD]}
catch {file delete [gitdir rr-cache MERGE_RR]}
+ catch {file delete [gitdir MERGE_RR]}
catch {file delete [gitdir SQUASH_MSG]}
catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir GITGUI_MSG]}