diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 4b0884b7bb..fdb7d0f10b 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3,8 +3,8 @@ * Fredrik Kuivinen. * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ -#include "advice.h" #include "cache.h" +#include "advice.h" #include "lockfile.h" #include "cache-tree.h" #include "commit.h" |