]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11fd3e4)
ignore another branch
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:36:13 +0000 (20:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:36:13 +0000 (20:36 +0200)
misc/tools/conflict-watch.sh patch | blob | history

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index 966fef450b06b859b399702158d157987a4f3165..cf4b013902de8e0003c4b4433bd8fc9d7ce6478a 100755 (executable)
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -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=$(
                                (