cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools tools tools!

Browse Source
This commit is contained in:
Letter N
2021-01-31 10:47:25 +08:00
parent 945599e937
commit 0901cf9f10
105 changed files with 1612 additions and 8467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/mapmerge2/precommit.py Normal file → Executable file
View File

@@ -1,8 +1,8 @@
#!/usr/bin/env python3
import os
import pygit2
import dmm
from mapmerge import merge_map
from . import dmm
from .mapmerge import merge_map
def main(repo):
if repo.index.conflicts: