Johannes Schindelin <johannes.schinde...@gmx.de> writes: > This is the second iteration of the long-awaited re-roll of the attempt to > avoid spawning merge-recursive from the builtin am and use merge_recursive() > directly instead.
I wanted to queue this in 'pu', but an unfortunate series that changes the convert_to_git() infrastructure has serious conflicts with the changes in this series. I am still unsure if these changes cannot be done without butchering the calling convention of what leads to convert_to_git(), but in the meantime, this cannot yet be merged to 'pu'. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
