forked from qt-creator/qt-creator
Git: Use the right commit from history before merge
Task-number: QTCREATORBUG-12415 Change-Id: I6328c8b0e3579eeddae9051a9ac5c587426163fe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
8ec4451069
commit
c69e4f27cb
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user