Johannes Sixt schrieb: > Rebase -i emitted used to write merge-recursive's conflict hints that said > "modify/delete", "modify/rename", "content", etc. I think that's what you > were looking for. But these hints have vanished since quite some time now. > I haven't taken the time, yet, to track down when this happened and why. Ok, I bisected it to 6eb1b437 (cherry-pick/revert: make direct internal call to merge_tree(), 2008-09-02), which is part of a series around merge-recursive: 1ad6d46..ed520a8 The commit message says: "One regression is that the status message is lost as there is no way to flush them from outside the refactored library code yet." But is it intentional that these messages were never recovered? BTW, I miss the messages a lot, too, but I'm unfamiliar with the code in question to try to do something about it. -- Hannes -- 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