Andrew's git / gitweb.git / diff
?
Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700)
committerJunio 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.

Trivial merge