Revision adda3c3beb0a244719becb1895e16227b0393bd1 authored by Marc Branchaud on 12 April 2010, 16:28:13 UTC, committed by Junio C Hamano on 12 April 2010, 16:50:09 UTC
Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fcd4240
decorate.h
#ifndef DECORATE_H
#define DECORATE_H
struct object_decoration {
const struct object *base;
void *decoration;
};
struct decoration {
const char *name;
unsigned int size, nr;
struct object_decoration *hash;
};
extern void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
extern void *lookup_decoration(struct decoration *n, const struct object *obj);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...