checkout: use --aggressive when running a 3-way merge (-m).
authorJunio C Hamano <junkio@cox.net>
Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 13 May 2006 21:00:15 +0000 (14:00 -0700)
commit618faa1...c7cb5898473861c286391d0a4b043107
treeeb997ae...5067b2a6a359316e0693055e159796a6copy hash to clipboard (tree)
parent66561f5...776f2343331fff5b98adff1000622f42copy hash to clipboard (diff)
git-checkout.sh