Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:45 +0000 (12:21 -0700)
commit9ce7100...1c1aa3a1523057c904f081abcf87ed60
tree6b8c27d...4489e5bed75ed415ba6f32b7a05cfe86copy hash to clipboard (tree)
parent786a89d...477c339676ed36d5d2d7507251344952copy hash to clipboard (diff)
parent43dee07...eb8faa400f24a9fee08e64d2d18224c2copy hash to clipboard (diff)
sequencer.c