comparison tests/test-ancestor.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 3b1b8f25443e
children b6db2e80a9ce
comparison
equal deleted inserted replaced
36985:66e64681e0a8 36986:afac8ab37c2c