Merge branch 'mm/lockfile-error-message' into maint
commitbb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:12 +0000 (14 18:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:12 +0000 (14 18:37 -0700)
treeed4a4e1cb99967b2940c5d96d03b2bcea734c404
parent167259bf830d224cfe862a46fc3e8a8f0619f540
parentaed7480ca4c284089a3b332fae770b4056eb08fc
Merge branch 'mm/lockfile-error-message' into maint

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