From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Dec 2015 19:14:18 +0000 (-0800)
Subject: Merge branch 'sg/lock-file-commit-error' into maint
X-Git-Tag: v2.7.0-rc1~7^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abca668a93f0039c8c3fe81a6625fcdf81c35bdf;p=thirdparty%2Fgit.git

Merge branch 'sg/lock-file-commit-error' into maint

Cosmetic improvement to lock-file error messages.

* sg/lock-file-commit-error:
  Make error message after failing commit_lock_file() less confusing
---

abca668a93f0039c8c3fe81a6625fcdf81c35bdf