diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:27 -0700 |
| commit | 3b8c4b727f389e3470ec31b20e2a97496da36086 (patch) | |
| tree | 5e188d15dfcd64a2504b31cd8a2d479ebc6fddd3 /t/t4013/diff.diff_initial..side | |
| parent | fbebb5cd0776d173fa605646f3e7a6aac9165900 (diff) | |
| parent | aed7480ca4c284089a3b332fae770b4056eb08fc (diff) | |
Merge branch 'mm/lockfile-error-message'
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions