From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 17:17:32 +0000 (-0800)
Subject: Merge branch 'jc/lock-report-on-error'
X-Git-Tag: v2.12.0-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af09003b2897db76cefdb08ab363ed68f2bb295b;p=thirdparty%2Fgit.git

Merge branch 'jc/lock-report-on-error'

* jc/lock-report-on-error:
  lockfile: move REPORT_ON_ERROR bit elsewhere
---

af09003b2897db76cefdb08ab363ed68f2bb295b