comparison tests/test-simplemerge.py @ 25397:0b6dee81ebb7

test-import: sync with 6084926366b9 for platforms without execbit
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 01 Jun 2015 22:41:07 -0400
parents f18830651811
children 56b2bcea2529
comparison
equal deleted inserted replaced
25393:eb52de500d2a 25397:0b6dee81ebb7