summaryrefslogtreecommitdiffstats
path: root/source/AllToLua.bat
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-13 23:02:22 +0200
committermadmaxoft <github@xoft.cz>2013-08-13 23:02:22 +0200
commitaf645c62c921869a1a6569935000ece3cb909e89 (patch)
treef9947aae502b86073f55d47547ef0084a0bf2ca2 /source/AllToLua.bat
parentClients are now ticked in cServer first, then in cWorld once they get assigned a world. (diff)
parentAdded ConsoleColors test for testing out linux console color codes. (diff)
downloadcuberite-af645c62c921869a1a6569935000ece3cb909e89.tar
cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.gz
cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.bz2
cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.lz
cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.xz
cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.zst
cuberite-af645c62c921869a1a6569935000ece3cb909e89.zip
Diffstat (limited to '')
-rw-r--r--source/AllToLua.bat6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/AllToLua.bat b/source/AllToLua.bat
index 75a028228..f7867fadb 100644
--- a/source/AllToLua.bat
+++ b/source/AllToLua.bat
@@ -8,8 +8,10 @@
:: If there was a Git conflict, resolve it by resetting to HEAD; we're regenerating the files from scratch anyway
-git checkout -- Bindings.cpp
-git checkout -- Bindings.h
+git checkout --ours Bindings.cpp
+git add -u Bindings.cpp
+git checkout --ours Bindings.h
+git add -u Bindings.h