Merge branch 'ma/roll-back-lockfiles' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:11:47 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 23:11:47 +0000 (15:11 -0800)
commitbe29bf8...1cfda74cce7a0e3312739c77eaf97288
tree5a592e9...fbc9d1588c8d138bfb16e3a753782e8dcopy hash to clipboard (tree)
parentd42470f...6ed76a916c46b8a4b6c62bb3792e9220copy hash to clipboard (diff)
parent350292a...efb38bbcd6255a424df6adbfe78910accopy hash to clipboard (diff)
merge-recursive.c
sequencer.c