Add a failing test for Christian
authorMarius Mathiesen <marius@gitorious.org>
Fri, 15 Jul 2011 12:53:03 +0000 (14:53 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 15 Jul 2011 12:53:03 +0000 (14:53 +0200)
commit99626ea0ec232d403395d2e9d7c9ee27017c2f48
tree38c9f2b0c9793f1e2e0f1df49b999ee72e180f1a
parent13862a57985d61ae215eab265c4751182303a6e9
Add a failing test for Christian

The failing test keeps an example that should work.
test/capillary/commit_test.rb
test/capillary/log_parser_test.rb
test/fixtures/double_merge.txt [new file with mode: 0644]