merge-recursive: don't segfault while handling rename clashes
[git] / builtin-merge-recursive.c
2008-02-10  Daniel BarkalowLibrary function to check for unmerged index entries
2008-02-10  Daniel BarkalowBuild-in merge-recursive