--- a/mercurial/HGWorkingCopyFile.st	Mon Jan 14 22:55:44 2013 +0000
+++ b/mercurial/HGWorkingCopyFile.st	Tue Jan 15 12:02:38 2013 +0000
@@ -229,6 +229,26 @@
 
 !HGWorkingCopyFile methodsFor:'operations'!
 
+markResolved
+    HGCommand resolve
+        workingDirectory: filename directory;
+        mark: true;
+        files: (Array with: filename baseName);
+        execute.
+
+    "Created: / 15-01-2013 / 10:22:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+markUnresolved
+    HGCommand resolve
+        workingDirectory: filename directory;
+        unmark: true;
+        files: (Array with: filename baseName);
+        execute.
+
+    "Created: / 15-01-2013 / 10:22:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 moveTo: destination
     "Make sure that this entry is tracked by Mercurial"