[tor-commits] [tor/master] Using diff -u in check_for_diffs

[asn@xxxxxxxxxxxxxx]

commit 537692c1e37cf40decbe4a93e6a47b69fae9885d
Author: rl1987 <rl1987@xxxxxxxxxxxxxxxx>
Date:   Wed Mar 6 19:55:38 2019 +0200

    Using diff -u in check_for_diffs
---
 scripts/git/post-merge.git-hook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook
index ed0e16279..31f44f84a 100755
--- a/scripts/git/post-merge.git-hook
+++ b/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
 }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits