No matches were found for subject:"automatic merging of \"set of lines\" text files with a specific git merge driver \(union\?\)"