Hash : 78ee7e81 Author : Date : 2014-02-05T14:10:19
More merge.conflictstyle fixes
https://libgit2.org/