summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-19 23:14:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-08-19 23:14:47 (GMT)
commit6cceea19eb6b86a4a293c92fe9653ccc8bb71526 (patch)
treef6982b6db7ab3723fd4b5d1b4db3b44f8affd759 /t/t3404-rebase-interactive.sh
parent9cdf86b2ee998d66008eeb9690571939db9074e2 (diff)
parent7d056deacea488833192d517059e04916285e90f (diff)
downloadgit-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.zip
git-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.tar.gz
git-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.tar.bz2
Merge branch 'en/sequencer-merge-labels'
The commit labels used to explain each side of conflicted hunks placed by the sequencer machinery have been made more readable by humans. * en/sequencer-merge-labels: sequencer: avoid garbled merge machinery messages due to commit labels
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9744e88..61d2028 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -256,7 +256,7 @@ test_expect_success 'stop on conflicting pick' '
D
=======
G
- >>>>>>> $commit... G
+ >>>>>>> $commit (G)
EOF
git tag new-branch1 &&
test_must_fail git rebase -i master &&