Merge branch 'ma/roll-back-lockfiles'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:03 +0000 (12:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:03 +0000 (12:01 -0700)
commit787aa97...217eb97827205271daba6d95c80b9049
tree5050330...38146d8ea2c39ef67852f69c08e2abe1copy hash to clipboard (tree)
parent868f7d2...384931641aa4901aab27f3f23577e63bcopy hash to clipboard (diff)
parent350292a...efb38bbcd6255a424df6adbfe78910accopy hash to clipboard (diff)
sequencer.c