diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-09-06 18:29:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-06 19:49:51 -0700 |
| commit | 4271666046b4b3e655eab88821096539099f3b14 (patch) | |
| tree | 87394519648f87f4f9141867bd7d37ccd7422046 /git-merge-octopus.sh | |
| parent | merge-recursive: get rid of virtual_id (diff) | |
| download | tgif-4271666046b4b3e655eab88821096539099f3b14.tar.xz | |
builtin-merge: release the lockfile in try_merge_strategy()
Once we committed the locked index, we should release the lockfile. In
most cases this is done automatically when the process ends, but this is
not true in this case.
[jc: with additional tests from Eric Raible]
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions