On Mon, Nov 26, 2012 at 3:50 PM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > What's possible is that someone had already merged the branch containing > "new", got conflicts, and resolved it in favor of "old" somewhere in the > history of your master branch. This is exactly what happened. I've actually found a merge of origin to mirror which reversed the change some time back and was subsequently merged back to origin later on. Most probably human error during merge. Interestingly, this was my first thought as well, but I've must have overlooked that particular merge the first time. Anyhow, it sorted now, many thanks for your help, Igor -- 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