From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Sep 2015 21:14:01 +0000 (-0700)
Subject: Merge branch 'jk/am-rerere-lock-fix'
X-Git-Tag: v2.6.0-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7662973ea38e39f2766a4403209189f263c914a3

Merge branch 'jk/am-rerere-lock-fix'

Recent "git am" introduced a double-locking failure when used with
the "--3way" option that invokes rerere machinery.

* jk/am-rerere-lock-fix:
rerere: release lockfile in non-writing functions
---

7662973ea38e39f2766a4403209189f263c914a3