diff options
| author |  Linus Torvalds <torvalds@osdl.org> | 2006-05-09 19:22:25 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-05-09 19:22:25 -0700 |
| commit | d1802851b0c112a065b43e3f83d631f867b7e1ce (patch) | |
| tree | a2916e2e9cd501f87c85dd0c37294fed4e199bed /contrib/emacs/Makefile | |
| parent | read-cache.c: use xcalloc() not calloc() (diff) | |
| download | tgif-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.xz | |
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>
Diffstat (limited to 'contrib/emacs/Makefile')
0 files changed, 0 insertions, 0 deletions