diff options
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.c b/ll-merge.c index 8be38d3bd4..28bc94c45d 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -6,6 +6,7 @@ #include "cache.h" #include "config.h" +#include "convert.h" #include "attr.h" #include "xdiff-interface.h" #include "run-command.h" |