git-demo

some change for non fast-forward merge

Name		Name	Last commit message	Last commit date
Latest commit History 39 Commits
README.md		README.md
stash.txt		stash.txt
test.txt		test.txt

Provide feedback