diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:37:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:37:18 +0300 |
commit | fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (patch) | |
tree | 1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 /t/t3404-rebase-interactive.sh | |
parent | 481424e1f100de690849a9f0348fc78f45ab815e (diff) | |
parent | b57321f57b324320bdcf9f453ec4788da166f8f4 (diff) |
Merge branch 'maint'
* maint:
git-clean: honor core.excludesfile
Documentation: Fix man page breakage with DocBook XSL v1.72
git-remote.txt: fix typo
core-tutorial.txt: Fix argument mistake in an example.
replace reference to git-rm with git-reset in git-commit doc
Grammar fixes for gitattributes documentation
Don't allow fast-import tree delta chains to exceed maximum depth
revert/cherry-pick: allow starting from dirty work tree.
t/t3404: fix test for a bogus todo file.
Conflicts:
fast-import.c
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 11139048fe..f1039d1a21 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -149,7 +149,7 @@ test_expect_success 'stop on conflicting pick' ' diff -u expect .git/.dotest-merge/patch && diff -u expect2 file1 && test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) && - test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l) + test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l) ' test_expect_success 'abort' ' |