From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Oct 2009 00:33:15 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc0~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3694209ca16c033fb4c539cc23b0b370e48952dd;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Document `delta` attribute in "git help attributes".
  Mark files in t/t5100 as UTF-8
  Remove a left-over file from t/t5100
---

3694209ca16c033fb4c539cc23b0b370e48952dd