Edward Thomson 86c8d02c07 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.		2015-11-25 15:37:11 -05:00
..
.gitted	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
asparagus.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
beef.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
bouilli.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
gravy.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
oyster.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
veal.txt	merge: add simple recursive test	2015-11-25 15:37:11 -05:00