Mercurial Repositories > eric / file diff

diff -r 51152e85c5e9 -r 1a43351889d5 Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 01 17:16:45 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 01 17:47:46 2014 +0100
@@ -1039,6 +1039,9 @@
         self.addArguments(args, opts)
         if force:
             args.append("--force")
+        if self.getPlugin().getPreferences("InternalMerge"):
+            args.append("--tool")
+            args.append("internal:merge")
         if rev:
             args.append("--rev")
             args.append(rev)