Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537
[exim.git] / .gitattributes
CommitLineData
b988b061
PP
1# Using merge=union should make it easier to maintain changelogs across
2# branches, by using the text from both sides for the merge.
3#
4doc/doc-txt/NewStuff merge=union
5doc/doc-txt/ChangeLog merge=union
6doc/doc-txt/OptionLists.txt merge=union
7src/README.UPDATING merge=union