From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/5d8da91e707668227464c9ba0e74b5fea1ee3b7e Merge branch 'jk/flockfile-stdio' Code clean-up. * jk/flockfile-stdio: config: move flockfile() closer to unlocked functions --- 5d8da91e707668227464c9ba0e74b5fea1ee3b7e