Merge branch 'mh/lockfile'

diff --git a/merge-recursive.c b/merge-recursive.c
index 4b0884b7bbdf177d6cfa2d07d3888cd212ec8a62..fdb7d0f10ba471bcdff26dc87851d7df34fdc971 100644 (file)
--- 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"