#!/bin/bash # Do not warn if there were no real merge git rev-parse -q --verify HEAD^2 >/dev/null || exit echo echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "! You probably used 'git pull' instead of 'git pull -r' !" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo echo "You can still fix it - please do 'git pull -r' now." echo
aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-01-10 13:24:35 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-01-10 13:30:08 +0100
commitd043dac2a54fc09b29feb0787ff272f23e1356cb (patch)
tree279a07fa4b60e1a7d727b7b450092848f043cf59 /source
parent855575426209820947579b51badbd6df279ba680 (diff)
update translations for 7.3.0 rc2/master
and force-fix errors using pocheck Change-Id: I7ba555073adb5a8ddfcb37be8dd61c7df6ad5b40 (cherry picked from commit f6628660c35c8b21a632418e1363784b906f6ff9)
Diffstat (limited to 'source')