[exim.git] / .gitattributes

# Using merge=union should make it easier to maintain changelogs across
# branches, by using the text from both sides for the merge.
#
doc/doc-txt/NewStuff         merge=union
doc/doc-txt/ChangeLog        merge=union
doc/doc-txt/OptionLists.txt  merge=union
src/README.UPDATING          merge=union
Commit	Line	Data
	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	#
	4	doc/doc-txt/NewStuff merge=union
	5	doc/doc-txt/ChangeLog merge=union
	6	doc/doc-txt/OptionLists.txt merge=union
	7	src/README.UPDATING merge=union