diff options
Diffstat (limited to 'scripts/git')
| -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 } |