diff tests/test-merge-local.t @ 21943:8534e670f4ee stable

help: use --template to specify existing style --style is deprecated since 3a35ba2681ec and 870d60294b04.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 21 Jul 2014 11:44:20 +0900
parents 2371f4aea665
children ef1eb6df7071
line wrap: on
line diff