Retire diff-helper.
The textual diff generation with built-in '-p' in diff-* brothers has proven to be useful enough that git-diff-helper outlived its usefulness. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
9
diff.h
9
diff.h
@ -19,15 +19,6 @@ extern void diff_change(unsigned mode1, unsigned mode2,
|
||||
const unsigned char *sha2,
|
||||
const char *base, const char *path);
|
||||
|
||||
extern void diff_helper_input(unsigned mode1,
|
||||
unsigned mode2,
|
||||
const unsigned char *sha1,
|
||||
const unsigned char *sha2,
|
||||
const char *path1,
|
||||
int status,
|
||||
int score,
|
||||
const char *path2);
|
||||
|
||||
extern void diff_unmerge(const char *path);
|
||||
|
||||
extern int diff_scoreopt_parse(const char *opt);
|
||||
|
Reference in New Issue
Block a user