マージのテスト

diff --cc test/hoge.txt
index 526e273,ca9084a..2a03603
--- 1/test/hoge.txt
--- 2/test/hoge.txt
+++ b/test/hoge.txt
@@@ -1,1 -1,1 +1,1 @@@
- XXXXXXXXXXXxsdfasdfa
 -sdfaadsasdfasadfsdasfdaf
++XXXXXXXXXXXsdasfdaf