libgit2/tests-clar/resources/merge-resolve/unchanged.txt
Edward Thomson bec65a5e99 merge!
2013-04-30 15:31:31 -05:00

2 lines
31 B
Plaintext

this file is unchanged in both