comparison tests/test-run-tests.py @ 23024:ec36969497de

resolve: run happily after conflict-free merge
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 22:30:04 -0700
parents 56610da39b48
children 625dd917f04f
comparison
equal deleted inserted replaced
23023:63c9088bebad 23024:ec36969497de