summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/diff.h b/diff.h
index 4b435e8..a0d2ce1 100644
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,10 @@ struct diff_options {
silent_on_remove:1,
find_copies_harder:1,
color_diff:1,
- color_diff_words:1;
+ color_diff_words:1,
+ has_changes:1,
+ quiet:1,
+ exit_with_status:1;
int context;
int break_opt;
int detect_rename;
@@ -170,8 +173,6 @@ extern int diff_setup_done(struct diff_options *);
extern void diffcore_std(struct diff_options *);
-extern void diffcore_std_no_resolve(struct diff_options *);
-
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
" -z output diff-raw with lines terminated with NUL.\n" \