diff -r 0b18c86c03a1 -r 11ea3d31937a Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Feb 16 20:18:29 2018 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Feb 17 14:59:26 2018 +0100
@@ -2147,11 +2147,15 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- args = self.initCommand("update")
- args.append("--clean")
+ if self.version >= (4, 5, 0):
+ args = self.initCommand("merge")
+ args.append("--abort")
+ else:
+ args = self.initCommand("update")
+ args.append("--clean")
dia = HgDialog(
- self.tr('Cancelling uncommitted merge'),
+ self.tr('Canceling uncommitted merge'),
self)
res = dia.startProcess(args, repodir, False)
if res:
