diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index e6fa7dca7..72cfa464d 100644 --- a/src/merge.c +++ b/src/merge.c @@ -5,13 +5,13 @@ * a Linking Exception. For full terms see the included COPYING file. */ -#include "common.h" +#include "merge.h" + #include "posix.h" #include "buffer.h" #include "repository.h" #include "revwalk.h" #include "commit_list.h" -#include "merge.h" #include "path.h" #include "refs.h" #include "object.h" |