| commit | bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:37:12 +0000 (14 18:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:37:12 +0000 (14 18:37 -0700) | ||
| tree | ed4a4e1cb99967b2940c5d96d03b2bcea734c404 | treesnapshot (tar.gz zip) |
| parent | 167259bf830d224cfe862a46fc3e8a8f0619f540 | commitdiff |
| parent | aed7480ca4c284089a3b332fae770b4056eb08fc | commitdiff |
Merge branch 'mm/lockfile-error-message' into maint
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation