diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:52:27 -0700 |
| commit | 9cd33bbc529bfa830c687d377433c46474d10e6a (patch) | |
| tree | 79268934569751906061421fcd5c46b751441c67 /diff.h | |
| parent | 8d35c114579fd870feb61f3746e1371634fd2163 (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz | |
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code.
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -241,7 +241,7 @@ extern int git_diff_ui_config(const char *var, const char *value, void *cb); extern int diff_use_color_default; extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int); -extern int diff_setup_done(struct diff_options *); +extern void diff_setup_done(struct diff_options *); #define DIFF_DETECT_RENAME 1 #define DIFF_DETECT_COPY 2 |