Now git ignores *.orig (created by my mergetool).
Merge branch 'GitIgnoreDotOrigFilesFeature' into develop