libgit2/tests-clar/resources/merge-resolve/automergeable.txt
Edward Thomson bec65a5e99 merge!
2013-04-30 15:31:31 -05: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