diff tests/test-extdiff.t @ 39135:485a3349d5ee

rebase: do not pass in user option to rollback in-memory merge conflict Nothing passed before e9e742bd0501.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 17 Aug 2018 10:21:25 +0900
parents be5a6fe3643a
children 5abc47d4ca6b
line wrap: on
line diff