calc: on editing invalidation of view with different zoom is wrong
[LibreOffice.git] / .git-hooks / post-merge
blobb1be51202a3fd0d1e8f564acf700a74a00894166
1 #!/bin/sh
3 # Do not warn if there were no real merge
4 git rev-parse -q --verify HEAD^2 >/dev/null || exit
6 echo
7 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
8 echo "! You probably used 'git pull' instead of 'git pull -r' !"
9 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
10 echo
11 echo "You can still fix it - please do 'git pull -r' now."
12 echo