tests/resources/merge-recursive/.gitted/objects/3f/d41804a7906db846af5e868444782e546af46a


Log

Author Commit Date CI Message
Edward Thomson 86c8d02c 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.