diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-11-01 12:53:29 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-11-01 12:53:29 -0400 |
| commit | aebc4bd8ced7442ddccb9ab48e744872a903aa36 (patch) | |
| tree | 0d401b2df370b96b8bb7d460cb3d7325feb5f716 /t/t5324-split-commit-graph.sh | |
| parent | 43ac23945ccca26f25f6bfaf77e2b39557a74903 (diff) | |
| parent | f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5 (diff) | |
Merge branch 'ak/more-typofixes'
More typofixes.
* ak/more-typofixes:
t: fix typos
Diffstat (limited to 't/t5324-split-commit-graph.sh')
| -rwxr-xr-x | t/t5324-split-commit-graph.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 77e91547ea..1193726daa 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -203,7 +203,7 @@ then graph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 "fork" fi -test_expect_success 'test merge stragety constants' ' +test_expect_success 'test merge strategy constants' ' git clone . merge-2 && ( cd merge-2 && |