diff options
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated')
| -rw-r--r-- | tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated b/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated new file mode 100644 index 000000000..a83ffc26a --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated @@ -0,0 +1 @@ +d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson <ethomson@edwardthomson.com> 1358997664 -0600 commit: conflicting changes |