Sync with maint

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

Junio C Hamano committed Jun 21, 2013 at 11:26 UTC 3e7a5b489e45ae8a3a0b222893d58b172d883136

No changes.