diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-01-06 23:53:11 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-27 12:56:02 -0800 |
| commit | 2def7f017ccedd04d86f7f343020f1f1bf3dfac8 (patch) | |
| tree | 884015d566c2b4c5ac0f419b2bb9092756bd6d75 /t | |
| parent | t3504: do check for conflict marker after failed cherry-pick (diff) | |
| download | tgif-2def7f017ccedd04d86f7f343020f1f1bf3dfac8.tar.xz | |
t3507: fix indentation
We have some test cases which are indented 7-spaces instead of a tab.
Reindent with a tab instead.
This patch should appear empty with `--ignore-all-space`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 9b9b4ca8d4..2a0d119c8a 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' ' ' test_expect_success 'successful final commit clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git commit -a && - test_must_fail test_path_exists .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git commit -a && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'reset after final pick clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git reset && - test_must_fail test_path_exists .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git reset && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'revert conflict, diff3 -m style' ' |