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

Junio C Hamano committed Dec 11, 2015 at 11:14 UTC abca668a93f0039c8c3fe81a6625fcdf81c35bdf

No changes.