Commit c69e4f27 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Use the right commit from history before merge

Task-number: QTCREATORBUG-12415
Change-Id: I6328c8b0e3579eeddae9051a9ac5c587426163fe
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 8ec44510
......@@ -121,10 +121,7 @@ void ChangeSelectionDialog::selectCommitFromRecentHistory()
if (dialog.result() == QDialog::Rejected || dialog.commitIndex() == -1)
return;
if (dialog.commitIndex() > 0)
commit += QLatin1Char('~') + QString::number(dialog.commitIndex());
m_ui->changeNumberEdit->setText(commit);
m_ui->changeNumberEdit->setText(dialog.commit());
}
void ChangeSelectionDialog::chooseWorkingDirectory()
......
Markdown is supported
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