From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 May 2012 16:08:19 +0000 (+0200)
Subject: ignore some branches
X-Git-Tag: xonotic-v0.7.0~55^2~5
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=11fd3e4f1b48547cd59d893acc1137927ff120f8

ignore some branches
---

diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh
index 63f67c54..966fef45 100755
--- a/misc/tools/conflict-watch.sh
+++ b/misc/tools/conflict-watch.sh
@@ -139,6 +139,14 @@ case "$action" in
 			branches
 		) | while read -r HASH TYPE REFNAME; do
 			echo >&2 -n "$repo $REFNAME..."
+			case "$repo:$REFNAME" in
+				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant) continue ;;
+				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-original) continue ;;
+				xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;;
+				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 ;;
+			esac
 			out=$(
 				(
 					if [ -n "$repodir" ]; then