RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-02 03:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore another branch

Browse Source
This commit is contained in:
Rudolf Polzer 2012-05-14 20:36:13 +02:00
parent 11fd3e4f1b
commit d5adeaa297
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/tools/conflict-watch.sh
View File

@ -146,6 +146,7 @@ case "$action" in
xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;;
xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;;
xonotic/darkplaces:refs/remotes/origin/master) continue ;;
xonotic/darkplaces:refs/remotes/origin/dp-mqc-render) continue ;;
esac
out=$(
(