Release notes: Turn the 0.15-rc1 release notes into 0.15 release notes

[stgit] / t / t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index 96fee15..8027e6c 100755 (executable)
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -38,7 +38,7 @@ test_expect_success \
 test_expect_success \
        'Push the first patch with conflict' \
        '
-       conflict_old stg push foo
+       conflict stg push foo
        '
 
 test_expect_success \