Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote: convert get_ref_match to take a struct refspec
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 9db5a2cf16e189bb3bd0ceec7d34c6651d630225..c362cfe90dbaf73d755aa54aa87237d8658ca853 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-14,6
+14,7
@@
#include "run-command.h"
#include "diff.h"
#include "refs.h"
+#include "refspec.h"
#include "commit.h"
#include "diffcore.h"
#include "revision.h"