Populate the cached config options with the defaults
[stgit] / t / t1200-push-modified.sh
index a591124..2077492 100755 (executable)
@@ -49,7 +49,7 @@ test_expect_success \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \
-    "(cd bar && conflict_old stg push
+    "(cd bar && conflict stg push
      )
 "