summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/automergeable.txt
blob: ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf (plain)
1
2
3
4
5
6
7
8
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