comparison hgext/fetch.py @ 39134:e338a921a0cd

rebase: add test for in-memory merge conflicts
author Yuya Nishihara <yuya@tcha.org>
date Fri, 17 Aug 2018 10:19:17 +0900
parents c6061cadb400
children c303d65d2e34
comparison
equal deleted inserted replaced
39133:06baaf43c959 39134:e338a921a0cd