diff mercurial/transaction.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 203908968644
children 0d05915b688d
line wrap: on
line diff