diff options
| author |  Keith Cascio <keith@CS.UCLA.EDU> | 2009-01-14 16:48:24 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-19 21:17:38 -0800 |
| commit | 537a071f41259c8631284bef28497280cd33db95 (patch) | |
| tree | 40409c1b95caf3ed65a47a9b2df5aaef8c5eeb88 /Documentation/git-merge-file.txt | |
| parent | builtin-fsck: fix off by one head count (diff) | |
| download | tgif-537a071f41259c8631284bef28497280cd33db95.tar.xz | |
test more combinations of ignore-whitespace options to diff
There are three flags involved (-w -b and --ignore-space-at-eol) which
makes 8 combinations possible in total, but only 3 cases are tested (none,
-w alone and -b alone).
This adds the other 5 cases.
Signed-off-by: Keith Cascio <keith@cs.ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions