From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Sep 2010 16:39:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83

Merge branch 'maint'

* maint:
config.txt: fix placement of diff.noprefix
---

9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83