![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700) |
* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
Trivial merge