Merge branch 'rs/diff-no-minimal'
commit39b5977b1391b0ee1fdfecf04955c32192f64936
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:20:46 +0000 (13 11:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:20:46 +0000 (13 11:20 -0700)
tree14edbf7a75770c0123741e771b990ba5a8a3ce63
parentd5c48c531816102d3a86fd807fb19e661a3787d5
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8
Merge branch 'rs/diff-no-minimal'

* rs/diff-no-minimal:
  git diff too slow for a file
builtin/blame.c
builtin/merge-file.c
builtin/merge-tree.c
builtin/rerere.c
combine-diff.c
diff.c
merge-file.c