t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

diff --git a/builtin/mktag.c b/builtin/mktag.c
index bc05227b521d2c5b01e6550924ecd6582179dbda..324a267163d758b5dea51405265ae89042a657ad 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -1,6 +1,5 @@
-#include "cache.h"
+#include "builtin.h"
 #include "tag.h"
-#include "exec_cmd.h"
 
 /*
  * A signature file has a very simple fixed format: four lines