diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-24 07:44:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-27 15:45:47 (GMT) |
| commit | 0e496492d26a8f7f360b6fad1aed2cae74403fa1 (patch) | |
| tree | 8e46a524080c7a49b19b603932d1a3f833ad08e2 /t/t3418-rebase-continue.sh | |
| parent | efd71f8913a876a0c333fa29382530d6abbc6164 (diff) | |
| download | git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.zip git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.gz git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.bz2 | |
t/helper: merge test-chmtime into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 7c91a85..9214d0b 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -24,7 +24,7 @@ test_expect_success 'interactive rebase --continue works with touched file' ' git checkout master && FAKE_LINES="edit 1" git rebase -i HEAD^ && - test-chmtime =-60 F1 && + test-tool chmtime =-60 F1 && git rebase --continue ' @@ -36,7 +36,7 @@ test_expect_success 'non-interactive rebase --continue works with touched file' test_must_fail git rebase --onto master master topic && echo "Resolved" >F2 && git add F2 && - test-chmtime =-60 F1 && + test-tool chmtime =-60 F1 && git rebase --continue ' |