diff LICENSE-MERGELY.html @ 4461:d6e96730edfb

diff: consistently use a=base=ancestor and b=changes in compare and PR Some additional fixes to the previous change.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 21 Aug 2014 23:46:55 +0200
parents aa3b55946089
children
line wrap: on
line diff