comparison mercurial/patch.py @ 20943:003cb972178d

merge: include ancestor node in merge actions
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:38:33 +0100
parents 9658a79968c6
children 4e2fb0ad00a9
comparison
equal deleted inserted replaced
20942:3737e653dcbe 20943:003cb972178d