summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 06:24:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-22 08:54:13 (GMT)
commit5cfcd07c931e6029a77f9393309f7d0ec7cdc118 (patch)
tree02ff16ec4156147c6a9b744033259d5c867837e4 /diff.h
parent9dcc829fe13b7c843a1df6c38479d5b8b8c7d20f (diff)
downloadgit-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.zip
git-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.tar.gz
git-5cfcd07c931e6029a77f9393309f7d0ec7cdc118.tar.bz2
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>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/diff.h b/diff.h
index 3deb7fa..96c2312 100644
--- a/diff.h
+++ b/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);