delta/libgit2.git/docs/merge-df_conflicts.txt, branch ethomson/test_https github.com: libgit2/libgit2.git merge! 2013-04-30T20:31:31+00:00 Edward Thomson ethomson@microsoft.com 2013-04-02T03:16:21+00:00 bec65a5e994bc4701216c9ca2c7dae83770b3edc