Merge branch 'mz/rebase-tests'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:26 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:27 +0000 (14:53 -0700)
* mz/rebase-tests:
rebase topology tests: fix commit names on case-insensitive file systems
tests: move test for rebase messages from t3400 to t3406
t3406: modernize style
add tests for rebasing merged history
add tests for rebasing root
add tests for rebasing of empty commits
add tests for rebasing with patch-equivalence present
add simple tests of consistency across rebase types

1  2 
t/t3400-rebase.sh
t/t3404-rebase-interactive.sh
Simple merge
Simple merge