On 24/09/2018 11:06, Phillip Wood wrote: > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > When trying out the new --color-moved-ws=allow-indentation-change I > was disappointed to discover it did not work if the indentation > contains a mix of spaces and tabs. This series adds a new option that > does. It's and RFC as there are some open questions about how to > proceed, see the last patch for details. Once there's a clearer way > forward I'll reroll with some documentation changes. > I should have said that this series is based on top of fab01ec52e ("diff: fix --color-moved-ws=allow-indentation-change", 2018-09-04), the result merges into current master without conflicts. Best Wishes Phillip > Phillip Wood (3): > xdiff-interface: make xdl_blankline() available > diff.c: remove unused variables > diff: add --color-moved-ws=allow-mixed-indentation-change > > diff.c | 124 ++++++++++++++++++++++++++++++++----- > diff.h | 1 + > t/t4015-diff-whitespace.sh | 89 ++++++++++++++++++++++++++ > xdiff-interface.c | 5 ++ > xdiff-interface.h | 5 ++ > 5 files changed, 208 insertions(+), 16 deletions(-) >