Use merge-recursive in git-am -3.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:27 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:06:16 +0000 (19:06 -0800)
commit579c9bb...986005282e049c6ad8f594a1ffc35fba
treed3e6cf8...e05a1193525a2563312acc70b259a8aecopy hash to clipboard (tree)
parenta970e84...8ad23a740e456fb4191ed61becef8989copy hash to clipboard (diff)
git-am.sh