Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'kc/maint-diff-bwi-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000
(17:52 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000
(17:52 -0800)
* kc/maint-diff-bwi-fix:
Fix combined use of whitespace ignore options to diff
test more combinations of ignore-whitespace options to diff
1
2
t/t4015-diff-whitespace.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
f26b5dc
6d12ace
)
diff --cc
t/t4015-diff-whitespace.sh
Simple merge