Merge branch 'sg/lock-file-commit-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Dec 2015 18:27:22 +0000 (10:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Dec 2015 18:27:22 +0000 (10:27 -0800)
commit1ff8856...c8d22bcdb528a6629239d638f927cb96
treecea4dd7...0991efd24272b40b1727128fa3d5d41ccopy hash to clipboard (tree)
parent1aaf149...5709c069a87c2673551296a6eb3f82c5copy hash to clipboard (diff)
parent87d01c8...4bf9860c8c21814c991f58652f6b4332copy hash to clipboard (diff)