--- a/mercurial/HGTests.st	Mon Jan 14 14:39:05 2013 +0000
+++ b/mercurial/HGTests.st	Mon Jan 14 17:01:55 2013 +0000
@@ -398,6 +398,50 @@
     "Modified (comment): / 10-12-2012 / 03:08:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!HGTests methodsFor:'tests - merging'!
+
+test_merge_01
+    "
+    Basic working copy tests after merge
+    "
+
+    | repo wc |
+
+    repo := self repositoryNamed:'mocks/hg/p3'.
+    wc := repo workingCopy. 
+    wc update: 2.
+    wc merge: (repo @ 1).
+
+    self assert: (wc root / 'Make.proto') isConflict.
+    self assert: (wc root / 'Make.proto') isResolved.
+    self deny:   (wc root / 'Make.proto') isUnresolved.
+
+    self assert: (wc root / 'Make.spec') isConflict.
+    self deny:   (wc root / 'Make.spec') isResolved.
+    self assert: (wc root / 'Make.spec') isUnresolved.
+
+    self deny: (wc root / 'MockHGP3Qux.st') isConflict.
+    self deny: (wc root / 'MockHGP3Qux.st') isResolved.
+    self deny: (wc root / 'MockHGP3Qux.st') isUnresolved.
+
+
+
+
+
+
+
+
+
+
+
+     "
+     UserPreferences fileBrowserClass openOn: repo directory.
+    "
+
+    "Created: / 14-01-2013 / 15:34:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 14-01-2013 / 16:58:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !HGTests methodsFor:'tests - misc'!
 
 test_config_01