mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-20 22:08:41 +00:00
86c8d02c07
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
9 lines
390 B
Plaintext
9 lines
390 B
Plaintext
GRAVY SOUP.
|
|
|
|
Get eight pounds of coarse lean beef--wash it clean and lay it in your
|
|
pot, put in the same ingredients as for the shin soup, with the same
|
|
quantity of water, and follow the process directed for that. Strain the
|
|
soup through a sieve, and serve it up clear, with nothing more than
|
|
toasted bread in it; two table-spoonsful of mushroom catsup will add a
|
|
fine flavour to the soup.
|