diff options
Diffstat (limited to 'tests/resources/merge-resolve/automergeable.txt')
| -rw-r--r-- | tests/resources/merge-resolve/automergeable.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/automergeable.txt b/tests/resources/merge-resolve/automergeable.txt new file mode 100644 index 000000000..ee3fa1b8c --- /dev/null +++ b/tests/resources/merge-resolve/automergeable.txt @@ -0,0 +1,9 @@ +this file is changed in master +this file is automergeable +this file is automergeable +this file is automergeable +this file is automergeable +this file is automergeable +this file is automergeable +this file is automergeable +this file is automergeable |