Uwe, On Friday, 2023-07-21 14:38:03 +0200, you wrote: > ... > What do I miss here? What I find confusing that hg diff displays in both > cases a conflicting difference but hg merge *ignores* in the first > example that conflict. Just run "hg log -G" on both your repositories :-) Sincerely, Rainer