From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Nov 2014 20:13:11 +0000 (-0800)
Subject: Merge branch 'nd/gitignore-trailing-whitespace' into maint
X-Git-Tag: v2.2.0-rc2~2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7fa1365c54c28b3cd9375539f381b54061a1880d?ds=inline;hp=--cc

Merge branch 'nd/gitignore-trailing-whitespace' into maint

* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"
---

7fa1365c54c28b3cd9375539f381b54061a1880d