diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-16 12:25:53 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-16 12:25:53 +0200 |
| commit | cbde4f546a3135d9889b37aa227468106958a94a (patch) | |
| tree | 0444a5f3d1797a01fb6a4c01def9933084652e8c /source/AllToLua.bat | |
| parent | Feature and bugfixes [SEE DESC] (diff) | |
| parent | Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. (diff) | |
| download | cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.gz cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.bz2 cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.lz cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.xz cuberite-cbde4f546a3135d9889b37aa227468106958a94a.tar.zst cuberite-cbde4f546a3135d9889b37aa227468106958a94a.zip | |
Diffstat (limited to 'source/AllToLua.bat')
| -rw-r--r-- | source/AllToLua.bat | 6 |
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 |