#!/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 cgit logo index : lo/core
LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/jvmaccess
AgeCommit message (Expand)Author
2017-10-23loplugin:includeform: jvmaccessStephan Bergmann
2017-08-01loplugin:constparams in variousNoel Grandin
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky