diff options
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,6 +4,7 @@ #include "gettext.h" #include "hex.h" #include "lockfile.h" +#include "merge.h" #include "commit.h" #include "run-command.h" #include "resolve-undo.h" |
