Hash : 958950b6 Author : Date : 2015-05-01T13:53:46
stash: document merge conflicts
https://libgit2.org/