merge-recursive: always roll back lock in `merge_recursive_generic()`
authorMartin Ågren <martin.agren@gmail.com>
Wed, 28 Feb 2018 19:07:56 +0000 (20:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 19:15:51 +0000 (11:15 -0800)
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>

No differences found