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>
Denton Liu committed
Jan 6, 2020 at 23:53 UTC
2def7f017ccedd04d86f7f343020f1f1bf3dfac8
1 file changed
+12
-12
t/t3507-cherry-pick-conflict.sh
+12
-12
@@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' '
381
'
382
383
test_expect_success 'successful final commit clears revert state' '
384
- pristine_detach picked-signed &&
384
+ pristine_detach picked-signed &&
385
386
- test_must_fail git revert picked-signed base &&
387
- echo resolved >foo &&
388
- test_path_is_file .git/sequencer/todo &&
389
- git commit -a &&
390
- test_must_fail test_path_exists .git/sequencer
386
+ test_must_fail git revert picked-signed base &&
387
+ echo resolved >foo &&
388
+ test_path_is_file .git/sequencer/todo &&
389
+ git commit -a &&
390
+ test_must_fail test_path_exists .git/sequencer
391
'
392
393
test_expect_success 'reset after final pick clears revert state' '
394
- pristine_detach picked-signed &&
394
+ pristine_detach picked-signed &&
395
396
- test_must_fail git revert picked-signed base &&
397
- echo resolved >foo &&
398
- test_path_is_file .git/sequencer/todo &&
399
- git reset &&
400
- test_must_fail test_path_exists .git/sequencer
396
+ test_must_fail git revert picked-signed base &&
397
+ echo resolved >foo &&
398
+ test_path_is_file .git/sequencer/todo &&
399
+ git reset &&
400
+ test_must_fail test_path_exists .git/sequencer
401
'
402
403
test_expect_success 'revert conflict, diff3 -m style' '