aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-30 20:26:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-30 23:31:39 -0700
commit076b0adcf9dac7bd9d18624087f679cc811aeb77 (patch)
tree99b9d07f74b648b5353a56350247b929efa7acde /unpack-trees.h
parent16da134b1f9b0fbd1d328999875d34d02e5470b4 (diff)
downloadgit-076b0adcf9dac7bd9d18624087f679cc811aeb77.tar.gz
git-076b0adcf9dac7bd9d18624087f679cc811aeb77.tar.xz
read-tree: move merge functions to the library
This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 38af89a6b..c4601621c 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -27,4 +27,9 @@ struct unpack_trees_options {
extern int unpack_trees(struct object_list *trees,
struct unpack_trees_options *options);
+int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
+int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
+int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
+int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
+
#endif