diff tests/test-issue1438.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 b63f6422d2a7
children 7a9cbb315d84
line wrap: on
line diff