diff hgext/logtoprocess.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 52790352dd05
children c31ce080eb75
line wrap: on
line diff