diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-06 19:55:38 +0200 |
|---|---|---|
| committer | rl1987 <rl1987@sdf.lonestar.org> | 2019-03-10 18:28:07 +0200 |
| commit | 537692c1e37cf40decbe4a93e6a47b69fae9885d (patch) | |
| tree | ffd0f3512a36dba8d6b81a46211f1dfbdc859676 | |
| parent | 5f253f6a4727b31242cd5998f1b3326cc9e7ed33 (diff) | |
| download | tor-537692c1e37cf40decbe4a93e6a47b69fae9885d.tar.gz tor-537692c1e37cf40decbe4a93e6a47b69fae9885d.zip | |
Using diff -u in check_for_diffs
| -rwxr-xr-x | scripts/git/post-merge.git-hook | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook index ed0e16279c..31f44f84ab 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 } |