• Show log

    Commit

  • Hash : 86c8d02c
    Author : Edward Thomson
    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.