t / t3900 / eucJP.txton commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1¤Ï¤ì¤Ò¤Û¤Õ
   2
   3¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
   4ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£