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