Merge branch 'mk/merge-incomplete-files'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:26:04 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:26:04 +0000 (11:26 -0700)
commit2e42338...806c2a79b691215ca3b238ac5beb57df
treed8fa640...56260460bcbf399db34cba54bf39e157copy hash to clipboard (tree)
parent6e40947...1acee5207595a8416d19508107ea475dcopy hash to clipboard (diff)
parentba31180...f8408761a48d4cd596259ca30a4375f2copy hash to clipboard (diff)