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>
Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)
commit8d7a397...ab561d3782f531e733b617e0e211f04a
tree299591f...e60cda26aa1219e280eb3f4030867c1ecopy hash to clipboard (tree)
parentd180285...b0c112a065b43e3f83d631f867b7e1cecopy hash to clipboard (diff)
git-checkout.sh