t7600-merge: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Cai committed
May 20, 2023 at 16:13 UTC
bd48dfad697e22f4b6ba4be46ea534d9c32f9e20
1 file changed
+20
-20
t/t7600-merge.sh
+20
-20
@@ -639,41 +639,41 @@ test_expect_success 'merge log message' '
639
test_debug 'git log --graph --decorate --oneline --all'
640
641
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
642
- git reset --hard c1 &&
643
- test_tick &&
644
- git merge c0 c2 c0 c1 &&
645
- verify_merge file result.1-5 &&
646
- verify_parents $c1 $c2
642
+ git reset --hard c1 &&
643
+ test_tick &&
644
+ git merge c0 c2 c0 c1 &&
645
+ verify_merge file result.1-5 &&
646
+ verify_parents $c1 $c2
647
'
648
649
test_debug 'git log --graph --decorate --oneline --all'
650
651
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
652
- git reset --hard c1 &&
653
- test_tick &&
654
- git merge c0 c2 c0 c1 &&
655
- verify_merge file result.1-5 &&
656
- verify_parents $c1 $c2
652
+ git reset --hard c1 &&
653
+ test_tick &&
654
+ git merge c0 c2 c0 c1 &&
655
+ verify_merge file result.1-5 &&
656
+ verify_parents $c1 $c2
657
'
658
659
test_debug 'git log --graph --decorate --oneline --all'
660
661
test_expect_success 'merge c1 with c1 and c2' '
662
- git reset --hard c1 &&
663
- test_tick &&
664
- git merge c1 c2 &&
665
- verify_merge file result.1-5 &&
666
- verify_parents $c1 $c2
662
+ git reset --hard c1 &&
663
+ test_tick &&
664
+ git merge c1 c2 &&
665
+ verify_merge file result.1-5 &&
666
+ verify_parents $c1 $c2
667
'
668
669
test_debug 'git log --graph --decorate --oneline --all'
670
671
test_expect_success 'merge fast-forward in a dirty tree' '
672
- git reset --hard c0 &&
673
- mv file file1 &&
674
- cat file1 >file &&
675
- rm -f file1 &&
676
- git merge c2
672
+ git reset --hard c0 &&
673
+ mv file file1 &&
674
+ cat file1 >file &&
675
+ rm -f file1 &&
676
+ git merge c2
677
'
678
679
test_debug 'git log --graph --decorate --oneline --all'