Merge branch 'sg/lock-file-commit-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:18 +0000 (11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:18 +0000 (11:14 -0800)
commitabca668...93f0039c8c3fe81a6625fcdf81c35bdf
tree4c76311...89c4e2f16694cf4cf2f7ee29cd4b54a8copy hash to clipboard (tree)
parent7605881...e80725a2fd1f4935289f663b7aefc024copy hash to clipboard (diff)
parent08a3651...e7f3163acbac461e0daf370329a1d332copy hash to clipboard (diff)