1 Commits (685c568a7ac73794bcc367fddae129c8fcaf1d2e)

Author SHA1 Message Date
Junio C Hamano c94736a27f merge-recursive: don't segfault while handling rename clashes 16 years ago