diff tests/test-issue1877.t @ 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 f2719b387380
children ca275f7ec576
line wrap: on
line diff