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)
commit12219414dd4b114081374361101ac2de65e0f1d7
tree3d4af2789869164f8050f43ac537329069bd9b02
parentc0f31b83a63f8b3aef0ec28225a50b6bae542d68
parent9ef5b2bd166aa390778d7dcda58714ee222d7377
Merge branch 'js/rebase-i-p-test-fix'

By Johannes Sixt
* js/rebase-i-p-test-fix:
  Fix t3411.3 to actually rebase something
t/t3411-rebase-preserve-around-merges.sh