Move "no merge candidate" warning into git-pull