From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:52 +0000 (+0900)
Subject: Merge branch 'jk/flockfile-stdio'
X-Git-Tag: v2.18.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d8da91e707668227464c9ba0e74b5fea1ee3b7e;p=thirdparty%2Fgit.git

Merge branch 'jk/flockfile-stdio'

Code clean-up.

* jk/flockfile-stdio:
  config: move flockfile() closer to unlocked functions
---

5d8da91e707668227464c9ba0e74b5fea1ee3b7e