Fix git merge command

2017-10-08 17:29:14 +11:00 · 2017-10-08 17:29:14 +11:00 · 7a4bfca106
parent 0db886f91d
commit 7a4bfca106
1 changed files with 1 additions and 1 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -41,7 +41,7 @@ windows-x86_64-binaries:
 libretro-test:
  script:
    - apt-get update && apt-get -y install build-essential git
-    - git merge libretro
+    - git merge origin/libretro
    - make -C higan compiler=g++ binary=library target=libretro
    - mkdir libretro-nightly
    - cp -a higan/out/higan/out/higan_sfc_libretro.so higan-nightly/