Merge branch 'ls/filter-process' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 23:38:09 +0000 (15:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 23:38:09 +0000 (15:38 -0800)
commit5ed29656db981c15d9f96dc1c943be4116714bfc
treed2382fc061c32f9f2c27561b5244ef906e608617
parent555976fc0a08897db2849241939e3ccc2f44349e
parent7eeda8b8214bfd171f9ed1265ecc5bfa1d06c607
Merge branch 'ls/filter-process' into next

Doc update.

* ls/filter-process:
  t0021: fix flaky test
t/t0021-conversion.sh