diff options
| author | Andrew Kreimer <algonell@gmail.com> | 2024-10-24 14:47:20 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-24 12:45:53 -0400 |
| commit | f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5 (patch) | |
| tree | c1723f82a36a89a212480f4740f59c17d2c33811 /t/t6404-recursive-merge.sh | |
| parent | fd3785337beb285ed7fd67ce6fc3d3bed2097b40 (diff) | |
| download | git-f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5.tar.gz | |
t: fix typos
Fix typos and grammar in documentation, comments, etc.
Via codespell.
Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t6404-recursive-merge.sh')
| -rwxr-xr-x | t/t6404-recursive-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh index 36215518b6..57169ca24b 100755 --- a/t/t6404-recursive-merge.sh +++ b/t/t6404-recursive-merge.sh @@ -88,7 +88,7 @@ test_expect_success 'result contains a conflict' ' ' test_expect_success 'virtual trees were processed' ' - # TODO: fragile test, relies on ambigious merge-base resolution + # TODO: fragile test, relies on ambiguous merge-base resolution git ls-files --stage >out && cat >expect <<-EOF && |