color-words was bad

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bdb93f26f2bc7025cc16a02acbc47cf49979e561..80b78de396a55febc1080e6a09af8b22472b9367 100755 (executable)
--- 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