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