From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 18 May 2010 19:18:35 +0000 (+0200)
Subject: admin-merge-2: color words in the diff
X-Git-Tag: xonotic-v0.1.0preview~455
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=b01ac246fe285f24aac700aa818298877b873f80

admin-merge-2: color words in the diff
---

diff --git a/all b/all
index bdb93f26..bf267396 100755
--- a/all
+++ b/all
@@ -660,7 +660,7 @@ case "$cmd" in
 				if [ -n "$note" ]; then
 					reportdo4 echo "$note"
 					reportecho4 "--> not merging, already had this one rejected before"
-				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
+				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff --color-words --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less'; then
 					git checkout master
 					org=`git rev-parse HEAD`
 					if ! git merge "$ref" 2>&1 | tee "$t"; then