summaryrefslogtreecommitdiff
path: root/t/t6047-diff3-conflict-markers.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6047-diff3-conflict-markers.sh')
-rwxr-xr-xt/t6047-diff3-conflict-markers.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6047-diff3-conflict-markers.sh b/t/t6047-diff3-conflict-markers.sh
index d383ce8..f4655bb 100755
--- a/t/t6047-diff3-conflict-markers.sh
+++ b/t/t6047-diff3-conflict-markers.sh
@@ -199,11 +199,11 @@ test_expect_success 'rebase --merge describes parent of commit being picked' '
)
'
-test_expect_success 'rebase --am describes fake ancestor base' '
+test_expect_success 'rebase --apply describes fake ancestor base' '
(
cd rebase &&
git rebase --abort &&
- test_must_fail git -c merge.conflictstyle=diff3 rebase --am master &&
+ test_must_fail git -c merge.conflictstyle=diff3 rebase --apply master &&
grep "||||||| constructed merge base" file
)
'