magicant/pull-request — pull request #5 by magicant (2012-08-28 14:15:21+00:00)
Title: Add line Z in file1

In this pull request, the branch will be rebased to resolve conflict.