Merge branch 'mm/lockfile-error-message'

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

Junio C Hamano committed Apr 3, 2016 at 10:29 UTC 3b8c4b727f389e3470ec31b20e2a97496da36086

No changes.