Make git-pull complain and give advice when there is nothing to merge with

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index e35d362f2697ebc7e627f230283aedb8ed92857f..0108e22adee8b4de922a2b00b514dd4d4cf23c55 100644 (file)
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "commit.h"