Fix parsing og `hg merge` output for Mercurial 4.6 and newer
In Mercurial 4.6 the wording of last line of the output has changed.
This commit updates the parser so it can handle both wordings.
395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_0
395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_0_49
395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_5
395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_5a
5fbac7506a8b870ac676b91c7329dc4b30a9f2f5 initialR
7ac1bca692cfc7161f842faf62eaf9ac4d239105 expecco_2_9_0
7ac1bca692cfc7161f842faf62eaf9ac4d239105 expecco_2_9_0_win75_lx36
7ac1bca692cfc7161f842faf62eaf9ac4d239105 expecco_2_9_1
b52cf51265614cf1198059fecf848c8cb1adda2e expecco_18_1_0
b52cf51265614cf1198059fecf848c8cb1adda2e expecco_18_1_0wa1
c250ea56603aef0aed785f0d21f0d8723a6bc163 expecco_2_10_0
c250ea56603aef0aed785f0d21f0d8723a6bc163 expecco_2_10_0_41
c250ea56603aef0aed785f0d21f0d8723a6bc163 expecco_2_11_0
c250ea56603aef0aed785f0d21f0d8723a6bc163 expecco_2_11_1
de20a60c89fa0ca521abf1bbd6aa0280fcb103ad expecco_ALM_1_10_0
de20a60c89fa0ca521abf1bbd6aa0280fcb103ad expecco_ALM_1_10_0_8
de20a60c89fa0ca521abf1bbd6aa0280fcb103ad expecco_ALM_1_11_0
de20a60c89fa0ca521abf1bbd6aa0280fcb103ad expecco_ALM_1_11_0_2
de20a60c89fa0ca521abf1bbd6aa0280fcb103ad expecco_ALM_1_11_2
df737ab429318bba620e26ef226e74b4a1962c9d expecco_2_8_0
df737ab429318bba620e26ef226e74b4a1962c9d expecco_2_8_0a
df737ab429318bba620e26ef226e74b4a1962c9d expecco_2_8_0b
df737ab429318bba620e26ef226e74b4a1962c9d expecco_ALM_1_9_5
df737ab429318bba620e26ef226e74b4a1962c9d expecco_ALM_1_9_6
eeca62b217c612ae1a68a309efe1be9584643da1 expeccoALM_1_9_0_1
f0220e0cb8436b1524f7875e298b08ac568baba5 expeccoALM_1_12
f8a771d2581bc0e0178188eceaa9c2207840b798 expecco_ALM_1_9_7
ff5c8d7b2bd826365f90ff4f4e81394953078d15 expecco_head_5844