Merge branch 'jk/flockfile-stdio'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:52 +0000 (13:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:52 +0000 (13:28 +0900)
Code clean-up.

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

1  2 
config.c

diff --cc config.c
Simple merge