Move declaration for alias.c to alias.h

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-05-20 20:40:06 +02:00
parent d9fcc7f871
commit 65b5f9483e
10 changed files with 17 additions and 5 deletions
--- a/builtin/merge.c
+++ b/builtin/merge.c
@ -34,6 +34,7 @@
 #include "string-list.h"
 #include "packfile.h"
 #include "tag.h"
+#include "alias.h"

 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)