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
..
4d4fe29d3433fdaa2f0f455d226f2c79d89cf3	merge: add simple recursive test	2015-11-25 15:37:11 -05:00