tree-conflicts: all tests

Hi tree-conflicts folks,

are these all the tree-conflicts tests?

./update_tests.py 46-50
./switch_tests.py 31-35
./merge_tests.py 101-103 111-121
./update_tests.py 1
./commit_tests.py 59-60
./tree_conflict_tests.py

Btw, what's the status of tree_conflict_tests.py?

~Neels

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194