#!/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 t'>
summaryrefslogtreecommitdiff
path: root/nlpsolver/help
AgeCommit message (Expand)Author
2022-07-05Related tdf#137145 tdf#137569 Capitalization + punctuation fixesAdolfo Jayme Barrientos