Files
git/diff.h
Junio C Hamano 4f33817d59 Merge branch 'kb/merge-recursive-rename-threshold' into next
* kb/merge-recursive-rename-threshold:
  diff: add synonyms for -M, -C, -B
  merge-recursive: option to specify rename threshold

Conflicts:
	Documentation/diff-options.txt
2010-09-30 15:00:03 -07:00

10 KiB