X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;fp=merge-recursive.c;h=cd3628c4d9b1831c73e752b3b49c9d88b9e23098;hb=5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe;hp=72bfbaf43a26a00aab901c5f30fe76b1a788e3ba;hpb=e2ced7de19c85f3b246480bfacdcc934c98c08ca;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 72bfbaf43..cd3628c4d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3,6 +3,7 @@
  * Fredrik Kuivinen.
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
+#include "advice.h"
 #include "cache.h"
 #include "cache-tree.h"
 #include "commit.h"
@@ -1182,6 +1183,11 @@ struct unpack_trees_error_msgs get_porcelain_error_msgs(void)
 		/* bind_overlap -- will not happen here */
 		NULL,
 	};
+	if (advice_commit_before_merge) {
+		msgs.would_overwrite = msgs.not_uptodate_file =
+			"Your local changes to '%s' would be overwritten by merge.  Aborting.\n"
+			"Please, commit your changes or stash them before you can merge.";
+	}
 	return msgs;
 }