Merge branch 'rt/cherry-revert-conflict-summary' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:13:43 +0000 (13:13 -0700)
commita28b919...05ed29cd9e6615179bd56edde50c6b63
tree92f0899...2f4fcddf2386f69f5be40a1a1b047db2copy hash to clipboard (tree)
parent71a3222...149f60f4a42141ad4d3526c4439034eccopy hash to clipboard (diff)
parent5112068...ec8664c8b34b8541a0518a4902ee9d94copy hash to clipboard (diff)
sequencer.c