Skip to content
Snippets Groups Projects
Commit ae535daa authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Merge branch '1.3' 

Conflicts:
	src/plugins/git/gitplugin.cpp
parents 138b12b5 fdbdf50c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/plugins/git/gitplugin.cpp
+ 1
− 1
View file @ ae535daa
...@@ -566,7 +566,7 @@ bool GitPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi ...@@ -566,7 +566,7 @@ bool GitPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi
tr("Do you want to commit the change?"), tr("Do you want to commit the change?"),
tr("The commit message check failed. Do you want to commit the change?"), tr("The commit message check failed. Do you want to commit the change?"),
&settings.promptToSubmit, !m_submitActionTriggered); &settings.promptToSubmit, !m_submitActionTriggered);
m_submitActionTriggered = false; m_submitActionTriggered = false;
switch (answer) { switch (answer) {
case VCSBase::VCSBaseSubmitEditor::SubmitCanceled: case VCSBase::VCSBaseSubmitEditor::SubmitCanceled:
return false; // Keep editing and change file return false; // Keep editing and change file
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment