diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:12 -0700 |
commit | bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2 (patch) | |
tree | ed4a4e1cb99967b2940c5d96d03b2bcea734c404 /Documentation/technical/api-gitattributes.txt | |
parent | Start preparing for 2.8.2 (diff) | |
parent | lockfile: improve error message when lockfile exists (diff) | |
download | tgif-bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2.tar.xz |
Merge branch 'mm/lockfile-error-message' into maint
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
Diffstat (limited to 'Documentation/technical/api-gitattributes.txt')
0 files changed, 0 insertions, 0 deletions