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.
723181f1bfd30e47a6d1d36a4d874e31e7a0a1a4