Merge branch 'jk/renamelimit' (early part)
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 19:37:28 +0000 (12:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 May 2008 19:37:28 +0000 (12:37 -0700)
* 'jk/renamelimit' (early part):
  diff: make "too many files" rename warning optional
  bump rename limit defaults
  add merge.renamelimit config option

1  2 
diff.c
diff.h

diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge