comparison tests/test-newcgi.t @ 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 8b84d040d9f9
children 7a9cbb315d84
comparison
equal deleted inserted replaced
17645:4721fc933943 17646:d44731a3adb8