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
..
info	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
objects	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
refs/heads	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
config	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
HEAD	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
index	merge: add simple recursive test	2015-11-25 15:37:11 -05:00