diff options
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 && |