Merge branch 'jk/complete-merge-pull'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:17:53 +0000 (12:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:17:53 +0000 (12:17 -0700)
commit5cf2c57...d08f38b90887d41d5c03376714f0b00d
treeb4bd9d0...1363e854346168319d2445df32c3d5d5copy hash to clipboard (tree)
parenta634a6d...09fc67ed8fb58925a6ae713b2a913a83copy hash to clipboard (diff)
parent8fee872...470bd63db6c396ea6208ea487eaa8fabcopy hash to clipboard (diff)