Merge branch 'stable'

[stgit] / t / t1201-pull-trailing.sh

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 8a74873..3a7efc1 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -29,9 +29,9 @@ test_expect_success \
 test_expect_success \
     'Port those patches to orig tree' \
     '(cd foo &&
-      GIT_DIR=../bar/.git git-format-patch --stdout \
+      GIT_DIR=../bar/.git git format-patch --stdout \
           $(cd ../bar && stg id master:{base})..HEAD |
-      git-am -3 -k
+      git am -3 -k
      )
     '