On branch branch2
 Changes to be committed:
	renamed:    "\341\204\206\341\205\256\341\204\214\341\205\246.rtf" -> Third.rtf
	modified:   first.rtf
	new file:   second.rtf
 On branch branch2
 Changes to be committed:
	modified:   Third.rtf
	modified:   second.rtf
 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	new file:   Fourth.rtf
	new file:   Third.rtf
	new file:   one.rtf
	new file:   second.rtf

 Changes not staged for commit:
	deleted:    "\341\204\206\341\205\256\341\204\214\341\205\246.rtf"
On branch master
Your branch is up-to-date with 'origin/master'.

Changes to be committed:
modified:   second.rtf
deleted:    "\341\204\206\341\205\256\341\204\214\341\205\246.rtf"
On branch branch2
Changes to be committed:
modified:   second.rtf
Revert " On branch branch2"

This reverts commit 768a46af73de499e0885df9a971924e20e429e1b.

Conflicts:
	second.rtf

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch branch2
 You are currently reverting commit 768a46a.

 Changes to be committed:
	modified:   Third.rtf
 before merge branch2 -
develop
before branch3 and master