Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-simplemerge.py @ 4633:ff7253a0d1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of whitespace, indentation and line continuation.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:06:37 +0200
parents 96d8a56d4ef9
children
line wrap: on
line diff
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -214,15 +214,14 @@ class TestMerge3(TestCase):
                             mid_marker='--',
                             end_marker='>>')
         self.assertEquals(''.join(ml),
-'''\
-aaa
-bbb
-<< a
-222
---
-333
->> b
-''')
+                          'aaa\n'
+                          'bbb\n'
+                          '<< a\n'
+                          '222\n'
+                          '--\n'
+                          '333\n'
+                          '>> b\n'
+                         )
 
     def test_insert_agreement(self):
         m3 = Merge3(['aaa\n', 'bbb\n'],