Merge branch 'rt/cherry-revert-conflict-summary'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 20:58:53 +0000 (13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Apr 2012 20:58:53 +0000 (13:58 -0700)
commitf5b121a...f305398a3e462b28240c0d6d754315c1
treecdc63f3...8e5258793205e337a907c56faef76d55copy hash to clipboard (tree)
parent7a9bb26...d6b0d434fc967ea2dd7a2c446370ddf7copy hash to clipboard (diff)
parent5112068...ec8664c8b34b8541a0518a4902ee9d94copy hash to clipboard (diff)
sequencer.c