summaryrefslogtreecommitdiff
path: root/t/t4257-am-interactive.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4257-am-interactive.sh')
-rwxr-xr-xt/t4257-am-interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4257-am-interactive.sh b/t/t4257-am-interactive.sh
index 5344bd248a..aed8f4de3d 100755
--- a/t/t4257-am-interactive.sh
+++ b/t/t4257-am-interactive.sh
@@ -10,7 +10,7 @@ test_expect_success 'set up patches to apply' '
git format-patch --stdout -2 >mbox &&
git reset --hard unrelated &&
- test_commit conflict-master file master base
+ test_commit conflict-main file main base
'
# Sanity check our setup.