Merge branch 'js/rebase-i-p-test-fix'

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

Junio C Hamano committed May 23, 2012 at 13:35 UTC 12219414dd4b114081374361101ac2de65e0f1d7

No changes.