{"thread":{"id":"51316","subject":"[PATCH 0/1] t3404: fix a typo","startedAt":"2019-06-14T12:16:11Z","lastAt":"2019-06-14T12:16:12Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"377234","messageId":"pull.267.git.gitgitgadget@gmail.com","threadId":"51316","inReplyTo":null,"subject":"[PATCH 0/1] t3404: fix a typo","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-14T12:16:07Z","receivedAt":"2019-06-14T12:16:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Just a typo I found while debugging something else.\n\nJohannes Schindelin (1):\n  t3404: fix a typo\n\n t/t3404-rebase-interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\nbase-commit: 0aae918dd929862d3ce0ea2960897787bb269a3b\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-267%2Fdscho%2Ffix-typo-confilct-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-267/dscho/fix-typo-confilct-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/267\n-- \ngitgitgadget\n"},{"id":"377235","messageId":"e924b6a464b3532cd05f8d3c2df1ddea3e861873.1560514566.git.gitgitgadget@gmail.com","threadId":"51316","inReplyTo":"pull.267.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] t3404: fix a typo","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-06-14T12:16:08Z","receivedAt":"2019-06-14T12:16:12Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThis one slipped through the review of a9279c678588 (sequencer: do not\nsquash 'reword' commits when we hit conflicts, 2018-06-19).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t3404-rebase-interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 1723e1a858..46d971b4ef 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -1031,7 +1031,7 @@ test_expect_success 'rebase -i --root reword root commit' '\n \ttest -z \"$(git show -s --format=%p HEAD^)\"\n '\n \n-test_expect_success 'rebase -i --root when root has untracked file confilct' '\n+test_expect_success 'rebase -i --root when root has untracked file conflict' '\n \ttest_when_finished \"reset_rebase\" &&\n \tgit checkout -b failing-root-pick A &&\n \techo x >file2 &&\n-- \ngitgitgadget\n"}]}