Commit 18afd41a authored by Screwtape's avatar Screwtape

Using "--no-commit" didn't work, let's try something else.

parent 3507c522
......@@ -41,7 +41,9 @@ windows-x86_64-binaries:
- apt-get update && apt-get -y install build-essential git
- git merge --no-commit origin/libretro
# git refuses to even attempt a merge if you haven't told it who you are,
# even if you use --no-commit. *sigh*
- git merge origin/libretro
- make -C higan compiler=g++ binary=library target=libretro
- mkdir libretro-nightly
- cp -a higan/out/higan/out/ 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