Merge branch 'sg/lock-file-commit-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:18 +0000 (11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:18 +0000 (11:14 -0800)
Cosmetic improvement to lock-file error messages.

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

Trivial merge