thodg/libgit2/tests/resources/merge-recursive/oyster.txt

• Show log

  Commit

• Hash : 86c8d02c
  Author :
  Date : 2015-10-22T20:20:07
  

  merge: add simple recursive test Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.

Download

• tests/resources/merge-recursive/oyster.txt

• OYSTER SOUP.
  
  Wash and drain two quarts of oysters, put them on with three quarts of
  water, three onions chopped up, two or three slices of lean ham, pepper
  and salt; boil it till reduced one-half, strain it through a sieve,
  return the liquid into the pot, put in one quart of fresh oysters, boil
  it till they are sufficiently done, and thicken the soup with four
  spoonsful of flour, two gills of rich cream, and the yelks of six new
  laid eggs beaten well; boil it a few minutes after the thickening is put
  in. Take care that it does not curdle, and that the flour is not in
  lumps; serve it up with the last oysters that were put in. If the
  flavour of thyme be agreeable, you may put in a little, but take care
  that it does not boil in it long enough to discolour the soup.
  

Download