/xml-merge-test

testing three-way merging of xml files with kdiff3

Watchers