From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:37:12 +0000 (-0700)
Subject: Merge branch 'mm/lockfile-error-message' into maint
X-Git-Tag: v2.8.2~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2?hp=--cc

Merge branch 'mm/lockfile-error-message' into maint

* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
---

bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2