summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-01-07 04:53:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-27 20:56:02 (GMT)
commit2def7f017ccedd04d86f7f343020f1f1bf3dfac8 (patch)
tree884015d566c2b4c5ac0f419b2bb9092756bd6d75
parente8a1c686aee560e07e4419f5adba1b1245289dd9 (diff)
downloadgit-2def7f017ccedd04d86f7f343020f1f1bf3dfac8.zip
git-2def7f017ccedd04d86f7f343020f1f1bf3dfac8.tar.gz
git-2def7f017ccedd04d86f7f343020f1f1bf3dfac8.tar.bz2
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>
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh24
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 9b9b4ca..2a0d119 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' '