Sfoglia il codice sorgente

Using diff -u in check_for_diffs

rl1987 6 anni fa
parent
commit
537692c1e3
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  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
 }