Make sure we error out if we can't remove a file on automatic merges.
[git/mingw.git] / delta.h
blobdf97ff84f7e45ec2d45fc613576d91057e2b5d61
1 #ifndef DELTA_H
2 #define DELTA_H
4 /* handling of delta buffers */
5 extern void *diff_delta(void *from_buf, unsigned long from_size,
6 void *to_buf, unsigned long to_size,
7 unsigned long *delta_size);
8 extern void *patch_delta(void *src_buf, unsigned long src_size,
9 void *delta_buf, unsigned long delta_size,
10 unsigned long *dst_size);
12 /* handling of delta objects */
13 struct delta;
14 struct object_list;
15 extern struct delta *lookup_delta(const unsigned char *sha1);
16 extern int parse_delta_buffer(struct delta *item, void *buffer, unsigned long size);
17 extern int parse_delta(struct delta *item, unsigned char sha1);
18 extern int process_deltas(void *src, unsigned long src_size,
19 const char *src_type, struct object_list *delta);
21 #endif