[merge "keeplocal"] name = Always keep local file during merge driver = true