thodg/libgit2/tests/resources/merge-recursive/gravy.txt
Branch
-
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.
-
tests/resources/merge-recursive/gravy.txt
-
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.