testing basic
try remove
restore file
permanent removal
added
first servant commit
untrack servant.txt
change test.txt
Merge branch 'master' into servant
change test.txt from master
change test.txt from servant
resolve conflict
change servant.txt
change test.txt again
merge test.txt again
change servant.txt from master
change test.txt from servant
Merge branch 'master' into servant
change servant.txt from servant
change servant.txt from master