diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:23:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:23:23 -0700 |
| commit | 8d7a397aab561d3782f531e733b617e0e211f04a (patch) | |
| tree | 299591f8e60cda26aa1219e280eb3f4030867c1e /diff-delta.c | |
| parent | d1802851b0c112a065b43e3f83d631f867b7e1ce (diff) | |
| download | git-8d7a397aab561d3782f531e733b617e0e211f04a.tar.gz git-8d7a397aab561d3782f531e733b617e0e211f04a.tar.xz | |
checkout: use --aggressive when running a 3-way merge (-m).
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 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions