Skip to content
GitLab
Commit 1a6b99b2 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

merge, mergetime: don't overwrite existing files

parent a551428c
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment