Merge branch 'rs/diff-no-minimal' into next
commit6c74aa0cb045adac1122e6cae213d627d5a69305
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:14 +0000 (9 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:14 +0000 (9 15:28 -0700)
tree27c311a3f46cada60a622b03db5898e04ddbb4a3
parent90233322ffe19508544a82d2c96cfa5b22f8cbfb
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8
Merge branch 'rs/diff-no-minimal' into next

* 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