summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:26 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:27 -0700
commit9cd33bbc529bfa830c687d377433c46474d10e6a (patch)
tree79268934569751906061421fcd5c46b751441c67 /diff.h
parent8d35c114579fd870feb61f3746e1371634fd2163 (diff)
parent28452655af988094792483a51d188c58137760cd (diff)
downloadgit-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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index e027650cb0..66f8052e67 100644
--- a/diff.h
+++ b/diff.h
@@ -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