From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2016 17:29:27 +0000 (-0700)
Subject: Merge branch 'mm/lockfile-error-message'
X-Git-Tag: v2.9.0-rc0~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b8c4b727f389e3470ec31b20e2a97496da36086;p=git

Merge branch 'mm/lockfile-error-message'

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

3b8c4b727f389e3470ec31b20e2a97496da36086