Linus Torvalds d1802851b0 revert/cherry-pick: use aggressive merge. ...

After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-05-09 19:22:25 -07:00

4.0 KiB

Executable File

Raw Blame History

View Raw