libgit2/tests/resources/merge-resolve/automergeable.txt
2013-11-14 14:05:52 -08:00

10 lines
247 B
Plaintext

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