diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:07 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:08 +0900 |
commit | 96d14cbb91a2f4493f30c4caeb4ffff906c43be8 (patch) | |
tree | 67700eedd0e79970721a166779f9dd3c1843a00c /mergetools | |
parent | Merge branch 'dw/diff-highlight-makefile-fix' into maint (diff) | |
parent | config: use a static lock_file struct (diff) | |
download | tgif-96d14cbb91a2f4493f30c4caeb4ffff906c43be8.tar.xz |
Merge branch 'jk/config-lockfile-leak-fix' into maint
A leakfix.
* jk/config-lockfile-leak-fix:
config: use a static lock_file struct
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions