diff tests/test-push-checkheads-superceed-A4.t @ 36986:afac8ab37c2c

cmdutil: drop redundant import of merge module
author Yuya Nishihara <yuya@tcha.org>
date Sun, 18 Mar 2018 12:54:03 +0900
parents 4441705b7111
children 34a46d48d24e
line wrap: on
line diff