diff tests/test-diff-issue2761.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 73e3e368bd42
children 55c6ebd11cb9
line wrap: on
line diff