Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Fix t3404 for Windows
Browse files Browse the repository at this point in the history
The usual problem: CR/LF...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho authored and patthoyts committed Feb 1, 2013
1 parent 8b09750 commit 694fb72
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions t/t3404-rebase-interactive.sh
Expand Up @@ -784,7 +784,7 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -797,7 +797,7 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -810,7 +810,7 @@ test_expect_success 'running "git rebase -ix git show HEAD"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -823,7 +823,7 @@ test_expect_success 'rebase -ix with several <CMD>' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -837,7 +837,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,11d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -862,7 +862,7 @@ test_expect_success 'rebase -ix with --autosquash' '
git rebase -i HEAD~4 >expect
) &&
sed -e "1,13d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand Down

0 comments on commit 694fb72

Please sign in to comment.