merge-recursive: don't segfault while handling rename clashes
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2009 00:38:15 +0000 (17:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2009 02:25:05 +0000 (19:25 -0700)
commitc94736a...7f89bfc268aed0de7264deecdc136a58
treee8307e0...18ce73552f826928d5bcd85325e366e8copy hash to clipboard (tree)
parent4258c21...ca2c3674be4b7e00a19db705eee77a48copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh [new file with mode: 0755]