Improve merge performance by avoiding in-index merges.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:34 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Jan 2007 23:57:44 +0000 (15:57 -0800)
commitc82d711...a1f499b43e21e0a4589a080edadaf706
treee67d86a...2ba26c96bf44bba637a8174657628a0ccopy hash to clipboard (tree)
parent2a3a3c2...7e7f1f257e9c6762e48b98f08a30011acopy hash to clipboard (diff)
git-merge.sh