Commit 7a4bfca1 authored by Screwtape's avatar Screwtape

Fix git merge command

parent 0db886f9
......@@ -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/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment