Merge branch 'master' of https://github.com/liaoshangchun/svntest

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7610 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
commit by svn

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7611 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
git commit。。。。then do not rebase

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7615 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
svn modify 。。。。。

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7639 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
git commit ----？

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7641 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
modify by git master

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7642 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
commit by branch1

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7643 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
new1 git commit

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7644 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
modify 2.txt by git

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7645 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
2 new git commit

git-svn-id: svn://192.168.1.242/XDK2Linux/project/posapp/svntest@7646 f9eab620-e96c-ec46-afb0-c9f6dc803ac6
Merge branch 'master' of https://github.com/liaoshangchun/svntest

Conflicts:
	1.txt