Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
4632:8d46056960ab 4633:ff7253a0d1da
212 name_b='b', 212 name_b='b',
213 start_marker='<<', 213 start_marker='<<',
214 mid_marker='--', 214 mid_marker='--',
215 end_marker='>>') 215 end_marker='>>')
216 self.assertEquals(''.join(ml), 216 self.assertEquals(''.join(ml),
217 '''\ 217 'aaa\n'
218 aaa 218 'bbb\n'
219 bbb 219 '<< a\n'
220 << a 220 '222\n'
221 222 221 '--\n'
222 -- 222 '333\n'
223 333 223 '>> b\n'
224 >> b 224 )
225 ''')
226 225
227 def test_insert_agreement(self): 226 def test_insert_agreement(self):
228 m3 = Merge3(['aaa\n', 'bbb\n'], 227 m3 = Merge3(['aaa\n', 'bbb\n'],
229 ['aaa\n', '222\n', 'bbb\n'], 228 ['aaa\n', '222\n', 'bbb\n'],
230 ['aaa\n', '222\n', 'bbb\n']) 229 ['aaa\n', '222\n', 'bbb\n'])