thodg/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb

Show log
Commit
Hash : b1eef912
Author :
Date : 2015-10-27T18:00:30

merge: add recursive test with conflicting contents