Explorar o código

Using diff -u in check_for_diffs

rl1987 %!s(int64=6) %!d(string=hai) anos
pai
achega
537692c1e3
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      scripts/git/post-merge.git-hook

+ 1 - 1
scripts/git/post-merge.git-hook

@@ -20,7 +20,7 @@ check_for_diffs() {
                then
                         echo "ATTENTION: $1 hook has changed:"
                         echo "==============================="
-                        diff "$installed" "$latest"
+                        diff -u "$installed" "$latest"
                fi
         fi
 }