diff mercurial/simplemerge.py @ 24815:023f97267784 stable

filectx: factor out creation of parent fctx This series tries to fix wrong ancestry information on annotating working directory. This change should slightly improves the readability of the next patch.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 18 Apr 2015 13:46:24 +0900
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff