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-13 14:00:15 -0700 |
| commit | 618faa1dc7cb5898473861c286391d0a4b043107 (patch) | |
| tree | eb997ae55067b2a6a359316e0693055e159796a6 /t | |
| parent | 66561f5a776f2343331fff5b98adff1000622f42 (diff) | |
| download | git-618faa1dc7cb5898473861c286391d0a4b043107.tar.gz git-618faa1dc7cb5898473861c286391d0a4b043107.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 't')
0 files changed, 0 insertions, 0 deletions