Merge branch 'jc/lock-report-on-error'
commitaf09003b2897db76cefdb08ab363ed68f2bb295b
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 17:17:32 +0000 (27 09:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 17:17:32 +0000 (27 09:17 -0800)
tree8f617103d7c7aee4fe31417fb88365e22e00edad
parent58fcd54853023b28a44016c06bd84fc91d2556ed
parentb22d7484034670d08f438c9f1376423adce1e29c
Merge branch 'jc/lock-report-on-error'

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