dummy merge (two branches) for dummies

[Uwe Brauer]

   > [...]

   > Here you've chosen to keep everything exactly as it was in the 'foo' branch.
That's want I want

   > Here you've chosen to keep everything exactly as it was in the 'uwe' branch.

That's what matt told me. Maybe I misinterpreted him.
   > pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
   > Kevin R. Bullock