pseudo-merge.ch: initial commit
Add a new (empty) header file to contain the implementation for selecting, reading, and applying pseudo-merge bitmaps. For now this header and its corresponding implementation are left empty, but they will evolve over the course of subsequent commit(s). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
May 23, 2024 at 17:26 UTC
89f47c45df7ff65f555548718641c4610f466f08
3 files changed
+9
Makefile
+1
@@ -1119,6 +1119,7 @@ LIB_OBJS += prompt.o
1119
LIB_OBJS += protocol.o
1120
LIB_OBJS += protocol-caps.o
1121
LIB_OBJS += prune-packed.o
1122
+LIB_OBJS += pseudo-merge.o
1123
LIB_OBJS += quote.o
1124
LIB_OBJS += range-diff.o
1125
LIB_OBJS += reachable.o
pseudo-merge.c
new
+2
@@ -0,0 +1,2 @@
1
+#include "git-compat-util.h"
2
+#include "pseudo-merge.h"
pseudo-merge.h
new
+6
@@ -0,0 +1,6 @@
1
+#ifndef PSEUDO_MERGE_H
2
+#define PSEUDO_MERGE_H
3
+
4
+#include "git-compat-util.h"
5
+
6
+#endif