merge-recursive: do not use on-file index when not needed.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Jan 2007 19:20:58 +0000 (11:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Jan 2007 22:45:20 +0000 (14:45 -0800)
commit8b944b5...78efcbbbedfd555e5eef1500dc6074d1
treecdc501b...4f1ac9c04b68086c40f0efa44287bf7acopy hash to clipboard (tree)
parentf518438...f08c814535e7bda374e403596eef90a3copy hash to clipboard (diff)
merge-recursive.c