From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 May 2006 02:24:16 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.1-rc1~117^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a3276bab880222e3117f8b8cbef40920dfe884;p=thirdparty%2Fgit.git

Merge branch 'fix'

* fix:
  checkout: use --aggressive when running a 3-way merge (-m).
  revert/cherry-pick: use aggressive merge.
---

f7a3276bab880222e3117f8b8cbef40920dfe884