Merge branch 'jc/maint-merge-recursive-fix'
* jc/maint-merge-recursive-fix: merge-recursive: don't segfault while handling rename clashes
Junio C Hamano committed
Aug 10, 2009 at 22:17 UTC
14468ab45bae83ad300f17f41fe8fd555329ee5e
No changes.