Merge branch 'fix'
* fix: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge.
Junio C Hamano committed
May 9, 2006 at 19:24 UTC
f7a3276bab880222e3117f8b8cbef40920dfe884
No changes.