merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

     1

adding a

     2

Now at: a.patch

     3

applying b.patch

     4

applying c.patch

     5

Now at: c.patch

     6

Now at: b.patch