projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36dd939 6d12ace)
Merge branch 'kc/maint-diff-bwi-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 01:07:51 +0000 (17:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 01:07:51 +0000 (17:07 -0800)
* kc/maint-diff-bwi-fix:
  Fix combined use of whitespace ignore options to diff

1  2 
t/t4015-diff-whitespace.sh patch | diff1 | diff2 | blob | history

diff --cc t/t4015-diff-whitespace.sh
Simple merge
Git—the stupid content tracker