From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Jun 2013 18:26:41 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.8.4-rc0~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e7a5b489e45ae8a3a0b222893d58b172d883136;p=thirdparty%2Fgit.git

Sync with maint

* maint:
  completion: complete diff --word-diff
---

3e7a5b489e45ae8a3a0b222893d58b172d883136