add foo
edit foo
add foo
edit foo
Merge branch 'aaa' of github.com:msatoh-ez/sandbox into aaa
edit bar
Merge pull request #1 from msatoh-ez/aaa

Aaa