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 branch2
Changes to be committed:
modified:   second.rtf
On branch develop
Changes to be committed:
new file:   develop.c
modified:   first.rtf
new file : develp_intro.html
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
Merge branch 'develop'

 Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.