Don't add merge commits multiple times with different sequence numbers
authorChristian Johansen <christian@gitorious.org>
Fri, 15 Jul 2011 08:42:46 +0000 (10:42 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 15 Jul 2011 08:49:33 +0000 (10:49 +0200)
commit6aef451a1e152182c03d141d52e68be8484f51f8
tree65a89e52fe6a23b4489ca34322611a126497c164
parentfb6841db8b3b757e961330d9a93895883b26cb31
Don't add merge commits multiple times with different sequence numbers

- Merge commits appear once in every branch of the merge
- Each entry represents the same commit and should have the same
  sequence number
lib/capillary/log_parser.rb
test/capillary/log_parser_test.rb
test/fixtures/simple_graph_no_ff.txt [new file with mode: 0644]