Avoid excessive rewrites in merge-recursive
authorAlex Riesen <raa.lkml@gmail.com>
Wed, 25 Apr 2007 20:06:59 +0000 (22:06 +0200)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Apr 2007 06:43:16 +0000 (23:43 -0700)
commitc135ee8...f8584996ead993c76015d2c03798ab9e
tree704d7f2...dac1166a25d5ab8ed73384cee7280f54copy hash to clipboard (tree)
parent6169a89...4fd29cf9c747bab7bd310877328bc7e2copy hash to clipboard (diff)
merge-recursive.c