Git: Fix popup message for merge
Git: Fix popup message for merge

Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <2b010cbad792a0c0a8175f752f93f83941fc6bc1@gmail.com>
Reviewed-by: André Hartmann <ae729fb1c7d8758f7538d0da659d7dbc2720843e@gmx.de>
Reviewed-by: Leena Miettinen <885fda02d52616fec24ed5fed9b3f0568fce3ead@digia.com>
Reviewed-by: Tobias Hunger <012f8d714267bccc9d4766fbeace9f175fcc70c4@digia.com>

danimo/qt-creator,kuba1/qtcreator,martyone/sailfish-qtcreator,Distrotech/qtcreator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,Distrotech/qtcreator,AltarBeastiful/qt-creator,omniacreator/qtcreator,danimo/qt-creator,omniacreator/qtcreator,AltarBeastiful/qt-creator,maui-packages/qt-creator,xianian/qt-creator,amyvmiwei/qt-creator,martyone/sailfish-qtcreator,xianian/qt-creator,farseerri/git_code,richardmg/qtcreator,maui-packages/qt-creator,farseerri/git_code,colede/qtcreator,AltarBeastiful/qt-creator,maui-packages/qt-creator,danimo/qt-creator,omniacreator/qtcreator,richardmg/qtcreator,danimo/qt-creator,amyvmiwei/qt-creator,kuba1/qtcreator,kuba1/qtcreator,martyone/sailfish-qtcreator,xianian/qt-creator,xianian/qt-creator,farseerri/git_code,colede/qtcreator,colede/qtcreator,farseerri/git_code,colede/qtcreator,omniacreator/qtcreator,martyone/sailfish-qtcreator,xianian/qt-creator,martyone/sailfish-qtcreator,farseerri/git_code,danimo/qt-creator,omniacreator/qtcreator,xianian/qt-creator,martyone/sailfish-qtcreator,farseerri/git_code,martyone/sailfish-qtcreator,maui-packages/qt-creator,darksylinc/qt-creator,colede/qtcreator,danimo/qt-creator,Distrotech/qtcreator,martyone/sailfish-qtcreator,AltarBeastiful/qt-creator,Distrotech/qtcreator,AltarBeastiful/qt-creator,kuba1/qtcreator,xianian/qt-creator,danimo/qt-creator,omniacreator/qtcreator,kuba1/qtcreator,maui-packages/qt-creator,amyvmiwei/qt-creator,xianian/qt-creator,xianian/qt-creator,darksylinc/qt-creator,kuba1/qtcreator,richardmg/qtcreator,richardmg/qtcreator,maui-packages/qt-creator,darksylinc/qt-creator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,darksylinc/qt-creator,kuba1/qtcreator,danimo/qt-creator,colede/qtcreator,richardmg/qtcreator,kuba1/qtcreator,amyvmiwei/qt-creator,colede/qtcreator,richardmg/qtcreator,darksylinc/qt-creator,Distrotech/qtcreator,kuba1/qtcreator,Distrotech/qtcreator,farseerri/git_code,omniacreator/qtcreator,AltarBeastiful/qt-creator,danimo/qt-creator,martyone/sailfish-qtcreator,Distrotech/qtcreator,darksylinc/qt-creator,farseerri/git_code,richardmg/qtcreator,amyvmiwei/qt-creator,amyvmiwei/qt-creator,darksylinc/qt-creator,maui-packages/qt-creator,darksylinc/qt-creator