view tests/test-wireproto.py.out @ 17646:d44731a3adb8

histedit-test: ensure that non commute test will never commute The previous version would commute if using merge algorithm (to be accurate, merge will cleanly prompt the user during the merge). The new version create and initial commit with some content for all involved files en ensure all changes are a content changes of the first lines. This lead to guaranteed conflict when commuted.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 21 Sep 2012 19:13:25 +0200
parents 08ef6b5f3715
children d3d32643c060
line wrap: on
line source

Hello, Foobar
['Hello, Fo, =;o', 'Hello, Bar']