dummy merge (two branches) for dummies

[Uwe Brauer]

   > ...except it's not quite true. Example 1 would _also_ keep any
   > non-overlapping changes from 'uwe' in files that also existed in
   > 'foo'.

I am not sure I understand this. I don't see this is in example 1. Can
you give me an example?