dist/ merge=ours app/Language/**/*.php merge=ours text=auto eol=lf