summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-06-14 17:40:23 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-23 17:35:27 -0700
commit0d21efa51cc7de5250d5da46bceacda78ba35373 (patch)
tree7716a2c8723a3e5cf7d479654f47867d27451330 /diff.h
parentcda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff)
downloadgit-0d21efa51cc7de5250d5da46bceacda78ba35373.tar.gz
Teach diff about -b and -w flags
This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to diff. The main part of the patch is teaching libxdiff about it. [jc: renamed xdl_line_match() to xdl_recmatch() since the former is used for different purposes in xpatchi.c which is in the parts of the upstream source we do not use.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index de9de574e7..b61fdc8f1e 100644
--- a/diff.h
+++ b/diff.h
@@ -46,6 +46,7 @@ struct diff_options {
int setup;
int abbrev;
const char *stat_sep;
+ long xdl_opts;
int nr_paths;
const char **paths;