summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 06:25:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-06 06:25:00 (GMT)
commite3c3a550d4815d34b5674776c36cdd6d8a31ab85 (patch)
tree4e29155b4383f995503807adf76c62f69347ed00 /diff.h
parent2718435b7b746c3c249525b02fbcbad68f5a45f3 (diff)
downloadgit-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.zip
git-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.tar.gz
git-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.tar.bz2
combine-diff: remove misguided --show-empty hack.
Now --always flag is available in diff-tree, there is no reason to have that hack in the diffcore side. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 32134d7..ff41c58 100644
--- a/diff.h
+++ b/diff.h
@@ -68,9 +68,9 @@ struct combine_diff_path {
};
int show_combined_diff(struct combine_diff_path *elem, int num_parent,
- int dense, const char *header, int show_empty);
+ int dense, const char *header);
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
extern void diff_addremove(struct diff_options *,
int addremove,