Documentation/git-merge.txt: Partial rewrite of How Merge Works

diff --git a/builtin-commit.c b/builtin-commit.c
index 41cf5f2dc2ca6b1de455268d0e700bfa3ef20451..ed3fe3f7ee033e09f87c0a86dc7db70b13c6a262 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -22,6 +22,7 @@
 #include "utf8.h"
 #include "parse-options.h"
 #include "path-list.h"
+#include "rerere.h"
 #include "unpack-trees.h"
 
 static const char * const builtin_commit_usage[] = {