diff options
| author |  Martin Ågren <martin.agren@gmail.com> | 2018-02-28 20:07:56 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-28 11:15:51 -0800 |
| commit | 51d3f43d2fd7f93cd19494eef4aef712fad597c2 (patch) | |
| tree | 915f5c117a9654ccc5b6dfabe47b036cacab910d /Documentation | |
| parent | sequencer: always roll back lock in `do_recursive_merge()` (diff) | |
| download | tgif-51d3f43d2fd7f93cd19494eef4aef712fad597c2.tar.xz | |
merge-recursive: always roll back lock in `merge_recursive_generic()`
If we return early, or if `active_cache_changed` is false, we forget to
roll back the lockfile.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions