Comment 4 for bug 721211

For "revno 3583": <email address hidden>
This has 2 parents:
('<email address hidden>',
 '<email address hidden>')

And in parent 0 ChangeLog has:
InventoryFile(... sha1='4fe40887e5637a3684969b6c4e87d311c49d7d43',
  <email address hidden>)
And in parent 1 ChangeLog has:
InventoryFile(... sha1='8fa908462620c547c95dc696ee77c71671496fe8',
  <email address hidden>)
And in the merge revision:
InventoryFile(... sha1='cf22953fbf8a47887c15cb44bf5a3beaba1c8117',
  <email address hidden>)

Looking at the 3-way diff, it looks like 3583 merges the contents of the left parent with the right parent. So it doesn't introduce any *new* text lines, but it does create a new total content. I can attach the 3 files if you want.

The short snapshot is that parent 0 has the lines about:
2011-01-27 The InnoDB Team

 * btr/btr0cur.c:
 Bug#59465 btr_estimate_number_of_different_key_vals use
 incorrect offset for external_size

2011-01-27 The InnoDB Team

 * include/trx0trx.h, trx/trx0trx.c:
 Bug#59440 Race condition in XA ROLLBACK and XA COMMIT
 after server restart

2011-01-25 The InnoDB Team

 * row/row0upd.c:
 Bug#59585 Fix 58912 introduces compiler warning
 due to potentially uninitialized variable

2011-01-25 The InnoDB Team

 * mtr/mtr0log.c:
 Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()

2011-01-25 The InnoDB Team

 * row/row0vers.c:
 Fix Bug#59464 Race condition in row_vers_build_for_semi_consistent_read

2011-01-25 The InnoDB Team

 * btr/btr0btr.c, btr/btr0cur.c, btr/btr0sea.c,
 buf/buf0buddy.c, buf/buf0buf.c, buf/buf0lru.c,
 include/buf0buf.h, include/buf0buf.ic, include/buf0lru.h,
 mem/mem0mem.c, page/page0zip.c:
 Fix Bug#59707 Unused compression-related parameters
 in buffer pool functions

2011-01-18 The InnoDB Team

 * include/sync0rw.h, sync/sync0arr.c, sync/sync0rw.c:
 Fix Bug#59579 rw_lock_debug_print outputs to stderr, not to
 SHOW ENGINE INNODB STATUS

2011-01-14 The InnoDB Team
 * btr/btr0cur.c, dict/dict0dict.c, handler/ha_innodb.cc,
 include/btr0cur.h, include/dict0mem.h, include/rem0cmp.h,
 include/rem0cmp.ic, include/srv0srv.h, rem/rem0cmp.c,
 srv/srv0srv.c, innodb_bug30423.test:
 Fix Bug#30423 InnoDBs treatment of NULL in index stats causes
 bad "rows examined" estimates

And parent 1 has the lines about:
2011-01-06 The InnoDB Team
 * row/row0merge.c:
 Fix Bug#59312 Examine MAX_FULL_NAME_LEN in InnoDB to address
 possible insufficient name buffer

2011-01-06 The InnoDB Team
 * dict/dict0dict.c, handler/ha_innodb.cc, handler/i_s.cc,
 include/univ.i:
 Fix Bug#58643 InnoDB: too long table name

And <email address hidden> merges those lines together in the new output.

Which means that the changelog *was* modified since the last revision that was had been merged before the deletion. It happens that both the individual ones were probably already merged, but the combination of their texts was not. (At least as I can sort it out.) So the graph looked something like this:

 5.1 branch

 A - some old base revision
 |\
 B C B = valis.dimov, C = georgi.kodinov
 |X \
 D \| D = <email address hidden>
 | |
 | E E = some 5.5 basis revision that includes those histories
 | |
 | F F = 5.5 revision that deleted ChangeLog file
  \ |
    ? The new merge tip (the subject of this bug report).

At this point, the individual lines of B & C have been explicitly deletede by
the 5.5 branch. However, the combination of B&C that created the D text has
not. So it is marked as conflicted, which is valid.