merge-recursive implicitely depends on trust_executable_bit
authorAlex Riesen <raa.lkml@gmail.com>
Mon, 6 Nov 2006 10:38:52 +0000 (11:38 +0100)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Nov 2006 16:42:02 +0000 (08:42 -0800)
commit9faed78...59046cb7cef7f132726bf81c5074b08d
treea43ac0e...d86936791bb70b7fd2436bb925bf5961copy hash to clipboard (tree)
parentfe732ed...e10f9b241c8df9b4ea081a4f33ad3968copy hash to clipboard (diff)
merge-recursive.c