thodg/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e

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

merge: add recursive test with conflicting contents