diff -r a75328ebac64 -r 49faa820151a Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Thu Mar 06 18:24:39 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Thu Mar 06 18:34:59 2014 +0100
@@ -136,9 +136,9 @@
forced merge (string, boolean)
"""
if self.numberButton.isChecked():
- rev = str(self.numberSpinBox.value())
+ rev = "rev({0})".format(self.numberSpinBox.value())
elif self.idButton.isChecked():
- rev = self.idEdit.text()
+ rev = "id({0})".format(self.idEdit.text())
elif self.tagButton.isChecked():
rev = self.tagCombo.currentText()
elif self.branchButton.isChecked():
