OSDN Git Service

Merge branch 'mm/lockfile-error-message'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:27 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:27 +0000 (10:29 -0700)
commit3b8c4b727f389e3470ec31b20e2a97496da36086
tree5e188d15dfcd64a2504b31cd8a2d479ebc6fddd3
parentfbebb5cd0776d173fa605646f3e7a6aac9165900
parentaed7480ca4c284089a3b332fae770b4056eb08fc
Merge branch 'mm/lockfile-error-message'

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