X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=80b78de396a55febc1080e6a09af8b22472b9367;hp=bdb93f26f2bc7025cc16a02acbc47cf49979e561;hb=fdc1b70ed7fe2da4dfdec19a04b13ac8ead2e836;hpb=94fd858c89410402003a550d997306009482fd72

diff --git a/all b/all
index bdb93f26..80b78de3 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 --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
 					git checkout master
 					org=`git rev-parse HEAD`
 					if ! git merge "$ref" 2>&1 | tee "$t"; then