Hello Johannes, hello Junio, Johannes Schindelin wrote: > Two-file merges were rare enough that they were dropped outside of the > radar. This fix is a trivial change to builtin-rerere.c::find_conflict(). > It is still sane to insist that we do not do rerere for symlinks, and > require to have stages #2 and #3, but we can drop the requirement to have > stage #1. rerere does not use information from there anyway. > > This fix is from Junio, together with two tests to verify that it works > as expected. > > Noticed by Uwe Kleine-König. when I tested Junio's patch and wrote that it doesn't work, I was wrong. I just recompiled git-rerere and called that instead of the installed version. The problem there was, that merge didn't called the updated. So: Acked-by: Uwe Kleine-König <ukleinek@xxxxxxxxxxxxxxxxxxxxxxxxxx> -- Uwe Kleine-König http://www.google.com/search?q=1+hertz+in+sec**-1 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
