delete for 123.txt and test.txt
Deleted for test directory
:reset
merge
changed for nemunemu.txt 20130411
Merge commit 'HEAD@{5}' into staging

Conflicts:
	nemunemu.txt
reply changed
Merge commit 'HEAD@{7}' into staging