diff tests/test-convert-cvs-detectmerge.t @ 25154:7b3feaa1ee3f

test-import: update for no-execbit platforms with 1ef96a3b8b89
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 18 May 2015 11:43:10 -0400
parents 96529f81e2e9
children e5e5ee2b60e4
line wrap: on
line diff