merge-recursive: introduce new functions to handle rename logic

diff --git a/revision.h b/revision.h
index 86985d68aa5d69bf1c0ee01fb6498f151fe31c0f..19dc9bdddba20dfa6ef1bdaaee0e82db3bdf8bd8 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -4,7 +4,7 @@
 #include "parse-options.h"
 #include "grep.h"
 #include "notes.h"
-#include "commit.h"
+#include "pretty.h"
 #include "diff.h"
 
 /* Remember to update object flag allocation in object.h */