diff options
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG')
| -rw-r--r-- | tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG b/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG new file mode 100644 index 000000000..245b18a2c --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG @@ -0,0 +1 @@ +rename conflict theirs |