diff tests/test-merge-commit.t @ 41078:46e0563c67db

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sun, 30 Dec 2018 17:31:57 +0900
parents d4e62df1c73d
children 91a0bc50b288
line wrap: on
line diff