diff options
| author | Mattes D <github@xoft.cz> | 2013-08-15 10:56:52 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-08-15 10:56:52 +0200 |
| commit | 1a52e89177a907b5d23d3e72f78d30a333da4bfe (patch) | |
| tree | 8f2783d06d423361b02457c77f90d6ec874a5191 /source/AllToLua.bat | |
| parent | Merge pull request #91 from tigerw/master (diff) | |
| parent | Added simple deadlock detection code. (diff) | |
| download | cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.gz cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.bz2 cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.lz cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.xz cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.zst cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.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 |