Code

Merge branch 'sp/merge' (early part)
authorJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
* 'sp/merge' (early part):
  Improve merge performance by avoiding in-index merges.

1  2 
git-merge.sh

diff --cc git-merge.sh
Simple merge