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

     1

#!/bin/sh

     2

     3

hg init

     4

hg log

     5

hg grep wah

     6

hg manifest

     7

hg verify