mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge.h: move declarations for merge.c from cache.h

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2023-05-16 06:33:54 +00:00
committed by Junio C Hamano
parent eaa966db79
commit 750324ddb8
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/merge.c
View File

@ -37,6 +37,7 @@
#include "color.h"
#include "rerere.h"
#include "help.h"
#include "merge.h"
#include "merge-recursive.h"
#include "merge-ort-wrappers.h"
#include "resolve-undo.h"