Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Pass diff flags to diff engine, so that combined
Antoine Pelisse apeli...@gmail.com writes:
+test_expect_success 'check combined output (no ignore space)' '
+ git show actual.tmp
+ sed -e 1,/^@@@/d actual.tmp actual
+ tr -d Q -\EOF expected
+ --always coalesce
+ - eol space coalesce
+ - space change coalesce
2 matches
Mail list logo