diff options
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 2ee1674690..129b4e62dd 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -21,6 +21,7 @@ #include "utf8.h" #include "log-tree.h" #include "color.h" +#include "rerere.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) |