checkout: merge local modifications while switching branches.

diff --git a/commit.c b/commit.c
index e9a29caa27fbdd94810abbc4fd9c44e06c81265c..56efc69f1f4bf1568eaa549bed16f7cc2cd669ba 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,6 +1,6 @@
+#include "cache.h"
 #include "tag.h"
 #include "commit.h"
-#include "cache.h"
 
 int save_commit_buffer = 1;