diff -r a9ef61b902ae -r 3d8ef499d7d9 mercurial/HGMergeTool.st
--- a/mercurial/HGMergeTool.st	Sun Mar 03 20:45:13 2013 +0000
+++ b/mercurial/HGMergeTool.st	Sun Mar 03 23:58:51 2013 +0000
@@ -179,12 +179,13 @@
     "Runs a merge on file. Return true, if file conflicts had been
      resolved, false otherwise"
 
-    ^HGCommand resolve
-        workingDirectory: file directory pathName;
-        files: (Array with: file baseName);
-        execute
+    ^file workingCopy repository execute: 
+        (HGCommand resolve
+            workingDirectory: file directory pathName;
+            files: (Array with: file baseName);
+            yourself)
 
-    "Modified: / 14-01-2013 / 20:57:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-03-2013 / 23:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGMergeTool::Smalltalk class methodsFor:'documentation'!
@@ -236,11 +237,12 @@
 
     | dinfo merged |
 
-    HGCommand resolve
-        workingDirectory: file directory pathName;
-        tool: 'internal:dump';
-        files: (Array with: file baseName);
-        execute.
+    file workingCopy repository execute:
+        (HGCommand resolve
+            workingDirectory: file directory pathName;
+            tool: 'internal:dump';
+            files: (Array with: file baseName);
+            yourself).
 
     dinfo := self changesetDiffInfo.
     dinfo read.
@@ -255,6 +257,7 @@
     ]
 
     "Created: / 14-01-2013 / 21:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-03-2013 / 23:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGMergeTool::Smalltalk methodsFor:'private'!