diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-06-14 17:40:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-23 17:35:27 -0700 |
| commit | 0d21efa51cc7de5250d5da46bceacda78ba35373 (patch) | |
| tree | 7716a2c8723a3e5cf7d479654f47867d27451330 /xdiff/xdiffi.h | |
| parent | cda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff) | |
| download | git-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 'xdiff/xdiffi.h')
| -rw-r--r-- | xdiff/xdiffi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h index dd8f3c986b..d3b72716b5 100644 --- a/xdiff/xdiffi.h +++ b/xdiff/xdiffi.h @@ -55,6 +55,5 @@ void xdl_free_script(xdchange_t *xscr); int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, xdemitconf_t const *xecfg); - #endif /* #if !defined(XDIFFI_H) */ |