thodg/libgit2/tests-clar/resources/merge-resolve/added-in-master.txt

Show log
Commit
Hash : bec65a5e
Author :
Date : 2013-04-01T22:16:21

merge!

tests-clar/resources/merge-resolve/added-in-master.txt
```
1
```
```
this file is added in master
```