libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated
2013-11-14 14:05:52 -08:00

2 lines
171 B
Plaintext

d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson <ethomson@edwardthomson.com> 1358997664 -0600 commit: conflicting changes