Junio C Hamano 329351feeb Merge branch 'kb/merge-recursive-rename-threshold' ...

* kb/merge-recursive-rename-threshold:
  diff: add synonyms for -M, -C, -B
  merge-recursive: option to specify rename threshold

Conflicts:
	Documentation/diff-options.txt
	Documentation/merge-strategies.txt

2010-10-26 21:54:04 -07:00

117 KiB

Raw Blame History

View Raw