--- a/mercurial/HGWorkingCopyFile.st	Mon Jan 14 14:39:05 2013 +0000
+++ b/mercurial/HGWorkingCopyFile.st	Mon Jan 14 17:01:55 2013 +0000
@@ -388,6 +388,18 @@
     "Created: / 15-11-2012 / 01:25:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+isConflict
+    "Return true, if the file had a conflict during merge or update.
+
+     Note, that this return true even if the file was later merged
+     and conflicts resolved. To check whether conflicts are resolved or
+     not, use #isResolved or isUnresolved"
+
+    ^wc mergeState includesKey: self pathNameRelative.
+
+    "Created: / 14-01-2013 / 16:54:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isIgnored
     ^ self status isIgnored
 
@@ -418,6 +430,15 @@
     "Modified: / 23-10-2012 / 11:13:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+isResolved
+    "Return true, if the file had a conflict during merge or update
+     and is marked as resolved."
+
+    ^(wc mergeState at: self pathNameRelative) == $R
+
+    "Created: / 14-01-2013 / 16:56:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isTracked
     | s |
 
@@ -427,6 +448,15 @@
     "Created: / 15-11-2012 / 00:11:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+isUnresolved
+    "Return true, if the file had a conflict during merge or update
+     and is marked as not yet resolved."
+
+    ^(wc mergeState at: self pathNameRelative) == $U
+
+    "Created: / 14-01-2013 / 16:56:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isUntracked
     "An alias for not-tracked"
     ^ self isNotTracked