diff mercurial/worker.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 1e5b38a919dd
children b3e51675f98e
line wrap: on
line diff