diff options
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours')
| -rw-r--r-- | tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours b/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours new file mode 100644 index 000000000..a1c50dce8 --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours @@ -0,0 +1 @@ +34bfafff88eaf118402b44e6f3e2dbbf1a582b05 |