On 2015-03-03 18.37, Anton Trunov wrote: [] > Signed-off-by: Anton Trunov <anton.a.trunov <at> gmail.com> Should we use the "real email" here (with the '@') ? > --- > t/t3032-merge-recursive-options.sh | 43 ++++++++++++++++++++++++++++++++++++++ > xdiff/xmerge.c | 10 ++++----- > 2 files changed, 48 insertions(+), 5 deletions(-) > > diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh > index 4029c9c..4cbedb4 100755 > --- a/t/t3032-merge-recursive-options.sh > +++ b/t/t3032-merge-recursive-options.sh > @@ -204,4 +204,47 @@ test_expect_success '--ignore-space-at-eol' ' > test_cmp expected actual > ' > > +# Setup for automerging with whitespace-only changes > +# on both sides and in *all* lines > + > +test_expect_success 'setup: w/s only changes in all lines on both sides' ' > + git rm -rf . && > + git clean -fdqx && > + rm -rf .git && > + git init missing && > + > + echo " two words" >text.txt && > + git add text.txt && > + test_tick && > + git commit -m "Initial revision" && > + > + git checkout -b remote && > + echo " \t\ttwo words " >text.txt && > + git commit -a -m "remote: insert whitespace only" && > + > + git checkout master && > + echo " two words" >text.txt && > + git commit -a -m "master: insert whitespace only" > +' > + > +test_expect_success 'w/s only in all lines: --ignore-space-change preserves ours' ' [] -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html