From: Rudolf Polzer Date: Mon, 14 May 2012 18:36:13 +0000 (+0200) Subject: ignore another branch X-Git-Tag: xonotic-v0.7.0~55^2~4 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d5adeaa2976c1d30239584f7a731d580d52d930e;p=xonotic%2Fxonotic.git ignore another branch --- diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh index 966fef45..cf4b0139 100755 --- 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=$( (