diff contrib/merge-test-compat.sh @ 3768:482195001997

branching: merge with compat fix on default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 24 May 2018 18:57:46 +0200
parents 13a4c35f7a0b
children 6db9e2350948
line wrap: on
line diff