]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
86436c28 JH |
4 | #ifndef DIFF_H |
5 | #define DIFF_H | |
6 | ||
77eb2720 JH |
7 | extern void diff_addremove(int addremove, |
8 | unsigned mode, | |
9 | const unsigned char *sha1, | |
10 | const char *base, | |
11 | const char *path); | |
12 | ||
13 | extern void diff_change(unsigned mode1, unsigned mode2, | |
14 | const unsigned char *sha1, | |
15 | const unsigned char *sha2, | |
16 | const char *base, const char *path); | |
17 | ||
81e50eab JH |
18 | extern void diff_guif(unsigned mode1, |
19 | unsigned mode2, | |
20 | const unsigned char *sha1, | |
21 | const unsigned char *sha2, | |
22 | const char *path1, | |
23 | const char *path2); | |
24 | ||
77eb2720 JH |
25 | extern void diff_unmerge(const char *path); |
26 | ||
57fe64a4 JH |
27 | extern int diff_scoreopt_parse(const char *opt); |
28 | ||
81e50eab JH |
29 | #define DIFF_FORMAT_HUMAN 0 |
30 | #define DIFF_FORMAT_MACHINE 1 | |
31 | #define DIFF_FORMAT_PATCH 2 | |
32 | extern void diff_setup(int reverse, int diff_output_style); | |
86436c28 | 33 | |
38c6f780 JH |
34 | extern void diff_detect_rename(int, int); |
35 | extern void diff_pickaxe(const char *); | |
36 | ||
37 | extern int diff_queue_is_empty(void); | |
38 | ||
39 | extern void diff_flush(const char **, int); | |
86436c28 JH |
40 | |
41 | #endif /* DIFF_H */ |