From 7a4bfca106450daec4ecda412248c23155ac4af6 Mon Sep 17 00:00:00 2001
From: Tim Allen <screwtape@froup.com>
Date: Sun, 8 Oct 2017 17:29:14 +1100
Subject: [PATCH] Fix git merge command

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 297fb5d5..337c4057 100644
--- 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/