Merge branch 'jk/renamelimit' (early part)
commitadf59ec127f447aa83c84f9dbe2ae4e6417f3760
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 19:37:28 +0000 (14 12:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 19:37:28 +0000 (14 12:37 -0700)
tree6f18778312b98ea48205c127c1a07e967dc4c77b
parent0bdf93cbf0afd568384f237378ba368e751a2f0f
parentb8960bbe7bdfc0b232462f916ee8151c83afd16f
Merge branch 'jk/renamelimit' (early part)

* 'jk/renamelimit' (early part):
  diff: make "too many files" rename warning optional
  bump rename limit defaults
  add merge.renamelimit config option
diff.c
diff.h