Merge branch 'fc/rerere-conflict-style'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:45 +0000 (12:06 -0700)
commit6d3c4e9...d40c3a7fce3c8bdc933feeb74a6b2b08
treebc3d2b2...238b57f89df7b8483e9fa5e369513a8ecopy hash to clipboard (tree)
parent520cd9c...20a97d1220d6f0ebf921406683ad62eecopy hash to clipboard (diff)
parentde3d8bb...736cafae0ff10e047e2afa994b1dd901copy hash to clipboard (diff)