--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge.py	Tue Aug 16 23:57:21 2011 +0300
@@ -0,0 +1,29 @@
+import common, hglib
+
+class test_merge(common.basetest):
+    def setUp(self):
+        common.basetest.setUp(self)
+
+        self.append('a', 'a')
+        rev, self.node0 = self.client.commit('first', addremove=True)
+
+        self.append('a', 'a')
+        rev, self.node1 = self.client.commit('change')
+
+    def test_basic(self):
+        self.client.update(self.node0)
+        self.append('b', 'a')
+        rev, node2 = self.client.commit('new file', addremove=True)
+        self.client.merge(self.node1)
+        rev, node = self.client.commit('merge')
+        diff = """diff -r %s -r %s a
+--- a/a
++++ b/a
+@@ -1,1 +1,1 @@
+-a
+\ No newline at end of file
++aa
+\ No newline at end of file
+""" % (node2[:12], node[:12])
+
+        self.assertEquals(diff, self.client.diff(change=node, nodates=True))