add xoxoxoxoxo into abc.txt
Revert "add xoxoxoxoxo into abc.txt"

This reverts commit db473a603ce5f6e6992a82ed2da02ae2682d47ff.
modify ghi.txt
git modify abc.txt
Revert "modify ghi.txt"

This reverts commit ff14aed5f2a9586d78f3f8f5e735c66a5290a152.
add ghi (123456789098765)
123
Merge branch 'master' of github.com:sasowang/git_test_init

Conflicts:
	abc.txt