Git: Fix regexp for cherry-pick and revert conflict
Git: Fix regexp for cherry-pick and revert conflict

Output should contain a \n in the end, so $ is counter-productive

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: Tobias Hunger <012f8d714267bccc9d4766fbeace9f175fcc70c4@digia.com>

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