diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:06 -0800 |
| commit | bb7c47a452ce4fa22d25da6a5e7684dbbf7033e2 (patch) | |
| tree | 4016ab7ed50f90930e183018097001b915a38e8b /resolve-undo.c | |
| parent | 46ab22261661a8b4d2e86badc55d26017739dc31 (diff) | |
| parent | c06fa62dfc9c882f60250e60ad91fbb6a7e6f8e7 (diff) | |
| download | git-bb7c47a452ce4fa22d25da6a5e7684dbbf7033e2.tar.gz | |
Merge branch 'nd/config-misc-fixes' into maint
Leakage of lockfiles in the config subsystem has been fixed.
* nd/config-misc-fixes:
config.c: handle lock file in error case in git_config_rename_...
config.c: rename label unlock_and_out
config.c: handle error case for fstat() calls
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions