mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combine-diff: remove misguided --show-empty hack.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2006-02-05 22:25:00 -08:00
parent 2718435b7b
commit e3c3a550d4
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.h
View File

@ -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,