Merge branch 'fc/rerere-conflict-style' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:48:54 +0000 (11:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:48:54 +0000 (11:48 -0700)
commitada8710...634b4f9f686bd0477bd92b272ec60801
tree858d045...56f90f939064c7bc27fdc2ae7516d66acopy hash to clipboard (tree)
parent5327207...0fbc442b34e6371c1f28b5ed21aef8a0copy hash to clipboard (diff)
parentde3d8bb...736cafae0ff10e047e2afa994b1dd901copy hash to clipboard (diff)