diff tests/test-filelog.py.out @ 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 d76ba2090e0c
children
line wrap: on
line diff