Revision 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 authored by Junio C Hamano on 06 January 2010, 20:32:02 UTC, committed by Junio C Hamano on 06 January 2010, 21:49:41 UTC
We should tell ll_merge() that the 3-way merge between stages #2 and #3 is an outermost merge, not a virtual-ancestor creation. Back when this code was originally written, users couldn't write custom merge drivers easily, so the bug didn't matter, but these days it does. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3273ebc
tag.h
#ifndef TAG_H
#define TAG_H
#include "object.h"
extern const char *tag_type;
struct tag {
struct object object;
struct object *tagged;
char *tag;
char *signature; /* not actually implemented */
};
extern struct tag *lookup_tag(const unsigned char *sha1);
extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size);
extern int parse_tag(struct tag *item);
extern struct object *deref_tag(struct object *, const char *, int);
#endif /* TAG_H */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...