Merge branch 'js/rebase-i-p-test-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:15 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2012 20:35:16 +0000 (13:35 -0700)
By Johannes Sixt
* js/rebase-i-p-test-fix:
  Fix t3411.3 to actually rebase something

1  2 
t/t3411-rebase-preserve-around-merges.sh